From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/Solutions.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index ab008d4..ee6648f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -77,6 +77,9 @@
     @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
     @ExcelColumn(name="绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
     private Integer type;
+    @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)", example = "1")
+    @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)")
+    private Integer shopId;
 
     @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
     @ExcelColumn(name="鏈�浣庡勾榫�")
@@ -113,6 +116,7 @@
     @ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
     @ExcelColumn(name="鎺ユ敹鏂囦欢閭")
     private String email;
+
     @ApiModelProperty(value = "鎵垮寘鍏徃")
     @ExcelColumn(name="鎵垮寘鍏徃")
     private String companyName;
@@ -128,17 +132,14 @@
     @ApiModelProperty(value = "鍏朵粬璇存槑")
     @ExcelColumn(name="鍏朵粬璇存槑")
     private String ortherInfo;
+    @ApiModelProperty(value = "绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    @ExcelColumn(name="绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    private String signKeyword;
 
-    @ApiModelProperty(value = "鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)", example = "1")
-    @ExcelColumn(name="鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)")
-    private Integer solutionBaseId;
 
     @ApiModelProperty(value = "鐗堟湰鍙�")
     @ExcelColumn(name="鐗堟湰鍙�")
     private String version;
-    @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
-    @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
-    private String signKeyword;
 
     @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
     @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
@@ -148,9 +149,20 @@
     @ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
     private Integer baseId;
 
+    @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+    @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+    private Integer validTypeNum;
+
     @ApiModelProperty(value = "鍛樺伐", example = "1")
     @TableField(exist = false)
     private Integer memberId;
+    @ApiModelProperty(value = "淇濋櫓鍏徃鍚嶇О", example = "1")
+    @TableField(exist = false)
+    private String insuranceName;
+
+    @ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer applyId;
 
     @ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
     @TableField(exist = false)
@@ -159,5 +171,14 @@
     @TableField(exist = false)
     private  List<SolutionWorktype> worktypeList;
 
+    @ApiModelProperty(value = "鎬诲懆鏈熻垂鐢�", example = "1")
+    @TableField(exist = false)
+    private BigDecimal cyclePrice;
+    @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О", example = "1")
+    @TableField(exist = false)
+    private String shopName;
+    @ApiModelProperty(value = "鏂规纭涔﹀璞�", example = "1")
+    @TableField(exist = false)
+    private Multifile fanganFile;
 
 }

--
Gitblit v1.9.3