From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 14:00:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 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..13b3163 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 @@ -71,7 +71,13 @@ @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷") //@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=瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締 ") private Integer bizType; @ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�") -- Gitblit v1.9.3