From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index 4690f9e..3c1dbea 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -68,10 +68,17 @@
//@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷 2璧勬枡鍒嗙被 3閽ュ寵鏌滅粓绔箍鍛� 4浜ゆ帶涓荤嚎璺�")
//@ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
- @ApiModelProperty(value = "涓氬姟绫诲瀷 涓氬姟绫诲瀷 0=璁垮杞﹁締-璁垮杞﹁締 ;1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;2=wms甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�;3=wms銆佸畨娉扮殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-鍔犲伐鐑熷嵏璐ц溅杈� ;4=wms瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=wms瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締' ")
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 " +
+ "0=璁垮杞﹁締-璁垮杞﹁締 ;" +
+ "1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;" +
+ "2=甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�;" +
+ "3=瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈� ;" +
+ "4=瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;" +
+ "5=瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締 ")
+ @ExcelColumn(name="涓氬姟绫诲瀷",index = 4,width = 16,valueMapping = "0=璁垮杞﹁締;1=澶栧崗杩愯緭杞﹁締;2=甯傚叕鍙稿嵏璐ц溅杈�;3=鍔犲伐鐑熷嵏璐ц溅杈�;4=瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;")
private Integer bizType;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
@@ -85,10 +92,25 @@
@TableField(exist = false)
@ExcelColumn(name="缁勫悎鍚嶇О",index = 3,width = 20)
private String groupName;
+ @ApiModelProperty(value = "瀹屾暣鍥剧墖鍦板潃 ")
+ @TableField(exist = false)
+ private String imgurlFull;
+ @ApiModelProperty(value = "绾胯矾鏁� ")
+ @TableField(exist = false)
+ private int lineNum;
+ @ApiModelProperty(value = "瀹屾垚绾胯矾璁＄畻瀹㈡埛鏁� ")
+ @TableField(exist = false)
+ private int customerDoneNum;
+ @ApiModelProperty(value = "瀹㈡埛鏁� ")
+ @TableField(exist = false)
+ private int customerNum;
@ApiModelProperty(value = "瀛愰泦鍒嗙被")
@TableField(exist = false)
private List<Category> childCategoryList;
+ @ApiModelProperty(value = "瀹㈡埛闆嗗悎")
+ @TableField(exist = false)
+ private List<JkCustomer> customerList;
}
--
Gitblit v1.9.3