From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期五, 01 十一月 2024 09:30:50 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java index 962ef21..173a079 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java @@ -79,6 +79,13 @@ @ApiModelProperty(value = "鏂规鍚嶇О" ) @TableField(exist = false) private String solutionName ; + + @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1") + @TableField(exist = false) + private Integer solutionType; + @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О" ) + @TableField(exist = false) + private String shopName ; @ApiModelProperty(value = "鏂规涓婚敭锛堝叧鑱攕olutions锛�", example = "1") @ExcelColumn(name="鏂规涓婚敭锛堝叧鑱攕olutions锛�") private Integer solutionId; -- Gitblit v1.9.3