From 39969f50f23ae92c5fc25005d8d367eea0570c31 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十二月 2023 18:21:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 96d2d41..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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
@TableField(exist = false)
- private Integer creatorName;
+ private String creatorName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -66,6 +66,10 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "鍔冲姟浜烘暟")
+ @TableField(exist = false)
+ private Integer countNum;
+
@ApiModelProperty(value = "鍥炬爣")
@ExcelColumn(name="鍥炬爣")
private String imgurl;
@@ -78,13 +82,10 @@
@ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
private Integer categoryId;
- @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
- @TableField(exist = false)
- private Integer categoryName;
@ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
- private Integer code;
+ private String code;
@ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@@ -100,7 +101,7 @@
@ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -113,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鍚屾鏃堕棿")
@@ -146,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