From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 2a76f72..569d570 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -14,7 +14,7 @@
 /**
  * 璁惧淇℃伅琛�
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Data
 @ApiModel("璁惧淇℃伅琛�")
@@ -52,13 +52,13 @@
     @ExcelColumn(name="澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "棰樼洰")
-    @ExcelColumn(name="棰樼洰")
-    private String title;
+    @ApiModelProperty(value = "璁惧埆鍚�")
+    @ExcelColumn(name="璁惧埆鍚�")
+    private String name;
 
     @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
     @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -79,7 +79,7 @@
 
     @ApiModelProperty(value = "璧勬簮绫诲瀷", example = "1")
     @ExcelColumn(name="璧勬簮绫诲瀷")
-    private BigDecimal resourceType;
+    private String resourceType;
 
     @ApiModelProperty(value = "缂栧彿")
     @ExcelColumn(name="缂栧彿")

--
Gitblit v1.9.3