From be0e4466c64ab2def5d2f34fd9394927250153ab Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 18:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index 0c48b92..8d31b83 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +18,7 @@
*/
@Data
@ApiModel("闂ㄧ瑙掕壊淇℃伅琛�")
-@TableName("`door_role`")
+@TableName("`device_role`")
public class DeviceRole {
@TableId(type = IdType.AUTO)
@@ -96,5 +97,9 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
+ @ApiModelProperty(value = "浣跨敤浜烘暟")
+ @ExcelColumn(name="浣跨敤浜烘暟")
+ @TableField(exist = false)
+ private Integer memberNum;
}
--
Gitblit v1.9.3