From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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 5eff5cf..dd2046a 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)
@@ -55,8 +56,8 @@
     @ExcelColumn(name="鍚嶇О")
     private String name;
 
-    @ApiModelProperty(value = "鏄惁榛樿 0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁榛樿 0鍚� 1鏄�")
+    @ApiModelProperty(value = "鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�", example = "1")
+    @ExcelColumn(name="鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�")
     private Integer isDefault;
 
     @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@@ -83,4 +84,22 @@
     @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
     private Integer status;
 
+    @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+    @ExcelColumn(name="娴峰悍鏍囪瘑")
+    private String hkId;
+
+    @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+    @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+    private Integer hkStatus;
+
+    @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date hkDate;
+
+    @ApiModelProperty(value = "浣跨敤浜烘暟")
+    @ExcelColumn(name="浣跨敤浜烘暟")
+    @TableField(exist = false)
+    private Integer memberNum;
+
 }

--
Gitblit v1.9.3