From 766089ad50ae807ab88ba83b2dbc4a53bda8e423 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十二月 2023 18:27:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..e9fd108 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;
@@ -80,7 +84,7 @@
@ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
@TableField(exist = false)
- private Integer categoryName;
+ private String categoryName;
@ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
--
Gitblit v1.9.3