From 98e52a2d1a05276e11d2e5c99ec05e670228fbd6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十二月 2023 18:21:20 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 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 b86c30d..d05fe0b 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,13 +82,10 @@
     @ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
     private Integer categoryId;
 
-    @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
-    @TableField(exist = false)
-    private String categoryName;
 
     @ApiModelProperty(value = "浼佷笟浠g爜")
     @ExcelColumn(name="浼佷笟浠g爜")
-    private Integer code;
+    private String code;
 
     @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
     @ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@@ -117,6 +114,13 @@
     @ApiModelProperty(value = "ERP鏍囪瘑")
     @ExcelColumn(name="ERP鏍囪瘑")
     private String erpId;
+    @ApiModelProperty(value = "ERP鐖剁骇缁勭粐鏍囪瘑")
+    @ExcelColumn(name="ERP鐖剁骇缁勭粐鏍囪瘑")
+    private String erpParentId;
+
+    @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+    @ExcelColumn(name="璐熻矗浜虹紪鐮�")
+    private String headId;
 
     @ApiModelProperty(value = "ERP鍚屾鏃堕棿")
     @ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -150,4 +154,22 @@
     @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;
+    @ApiModelProperty(value = "娴峰悍涓婄骇缁勭粐")
+    @TableField(exist = false)
+    private String hkParentId;
+
+
 }

--
Gitblit v1.9.3