From a22fa65d1027f8500c0494e97ff2232f70e9ca93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:27:06 +0800
Subject: [PATCH] 提交一把

---
 server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java |   87 ++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
index 6812937..2c34cfc 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
@@ -9,15 +9,14 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
-import java.math.BigDecimal;
 
 /**
- * 淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�
+ * 淇濋櫓鏂规淇℃伅琛�
  * @author 姹熻箘韫�
- * @date 2024/01/16 10:03
+ * @date 2024/10/28 19:16
  */
 @Data
-@ApiModel("淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
+@ApiModel("淇濋櫓鏂规淇℃伅琛�")
 @TableName("`solutions_base`")
 public class SolutionsBase {
 
@@ -32,7 +31,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -72,10 +71,6 @@
     @ExcelColumn(name="鐢熸晥鏃堕棿鏂瑰紡 0鏃ュ悗鐢熸晥 1娆℃湀鐢熸晥")
     private Integer validType;
 
-    @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
-    @ExcelColumn(name="绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
-    private Integer type;
-
     @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
     @ExcelColumn(name="鏈�浣庡勾榫�")
     private Integer minAge;
@@ -84,33 +79,9 @@
     @ExcelColumn(name="鏈�楂樺勾榫�")
     private Integer maxAge;
 
-    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
-    @ExcelColumn(name="淇濋櫓璐圭敤(浜�/澶╋級")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer timeUnit;
-
-    @ApiModelProperty(value = "寮�鎴疯")
-    @ExcelColumn(name="寮�鎴疯")
-    private String insureCycle;
-
-    @ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer insureCycleUnit;
-
-    @ApiModelProperty(value = "鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer priceCycleUnit;
-
     @ApiModelProperty(value = "鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�", example = "1")
     @ExcelColumn(name="鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�")
     private Integer singleWorktype;
-
-    @ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
-    @ExcelColumn(name="鎺ユ敹鏂囦欢閭")
-    private String email;
 
     @ApiModelProperty(value = "鐗瑰埆绾﹀畾")
     @ExcelColumn(name="鐗瑰埆绾﹀畾")
@@ -128,4 +99,52 @@
     @ExcelColumn(name="鐗堟湰鍙�")
     private String version;
 
+    @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
+    @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
+    private Integer dataType;
+
+    @ApiModelProperty(value = "鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
+    @ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
+    private Integer baseId;
+
+    @ApiModelProperty(value = "绛剧珷浣嶇疆鍏抽敭瀛�,澶氫釜鑻辨枃閫楀彿闅斿紑")
+    @ExcelColumn(name="绛剧珷浣嶇疆鍏抽敭瀛�,澶氫釜鑻辨枃閫楀彿闅斿紑")
+    private String signKeyword;
+
+    @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+    @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+    private Integer validTypeNum;
+
+    @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)", example = "1")
+    @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany)")
+    private Integer shopId;
+
+    @ApiModelProperty(value = "鎵瑰鐢熸晥澶╂暟", example = "1")
+    @ExcelColumn(name="鎵瑰鐢熸晥澶╂暟")
+    private Integer addValidDays;
+
+    @ApiModelProperty(value = "鎵瑰噺鐢熸晥澶╂暟", example = "1")
+    @ExcelColumn(name="鎵瑰噺鐢熸晥澶╂暟")
+    private Integer delValidDays;
+
+    @ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鏄惁鍙姞淇� 0鍚� 1鏄�")
+    private Integer canAdd;
+
+    @ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
+    private Integer canReduce;
+
+    @ApiModelProperty(value = "鏄惁鍙洿鎹㈡淳閬e崟浣� 0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鏄惁鍙洿鎹㈡淳閬e崟浣� 0鍚� 1鏄�")
+    private Integer canChangeUnit;
+
+    @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�")
+    private Integer delOnlyReplace;
+
+    @ApiModelProperty(value = "鎵垮寘鍏徃")
+    @ExcelColumn(name="鎵垮寘鍏徃")
+    private String companyName;
+
 }

--
Gitblit v1.9.3