From e2b0e215d7f208a8f40aadb5ff05cd0f3088f0d9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 09:09:35 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index e9fd108..c69f152 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -82,9 +82,6 @@
     @ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
     private Integer categoryId;
 
-    @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
-    @TableField(exist = false)
-    private String categoryName;
 
     @ApiModelProperty(value = "浼佷笟浠g爜")
     @ExcelColumn(name="浼佷笟浠g爜")
@@ -104,7 +101,7 @@
 
     @ApiModelProperty(value = "娴峰悍鏍囪瘑")
     @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -117,6 +114,10 @@
     @ApiModelProperty(value = "ERP鏍囪瘑")
     @ExcelColumn(name="ERP鏍囪瘑")
     private String erpId;
+
+    @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+    @ExcelColumn(name="璐熻矗浜虹紪鐮�")
+    private String headId;
 
     @ApiModelProperty(value = "ERP鍚屾鏃堕棿")
     @ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -150,4 +151,19 @@
     @ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
     private Date fsDate;
 
+    @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+    @TableField(exist = false)
+    private String categoryName;
+    @ApiModelProperty(value = "璐熻矗浜哄悕瀛�")
+    @TableField(exist = false)
+    private String headName;
+    @ApiModelProperty(value = "璐熻矗浜烘墜鏈哄彿")
+    @TableField(exist = false)
+    private String headPhone;
+
+    @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О")
+    @TableField(exist = false)
+    private String parentName;
+
+
 }

--
Gitblit v1.9.3