From 54130a901757db72ae1d7c8d20cdfc2123749244 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 25 六月 2025 10:06:09 +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/SolutionsBase.java | 133 +++++++++++++++++++++++++++++++++----------
1 files changed, 101 insertions(+), 32 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 8dfaa81..ee0181e 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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,15 +10,15 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
/**
- * 淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�
+ * 淇濋櫓鏂规淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2024/01/16 10:03
+ * @date 2024/10/28 19:16
*/
@Data
-@ApiModel("淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
+@ApiModel("淇濋櫓涓绘柟妗堜俊鎭〃")
@TableName("`solutions_base`")
public class SolutionsBase {
@@ -72,10 +73,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 +81,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 +101,100 @@
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
+ @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2褰撳墠鍚敤鐗堟湰", example = "1")
+ @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2褰撳墠鍚敤鐗堟湰")
+ 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 = "鏄惁鍙洿鎹㈡淳閬ｅ崟浣� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙洿鎹㈡淳閬ｅ崟浣� 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;
+
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿")
+ @ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿")
+ private Integer riskDelayTime;
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿鍗曚綅 0鍒嗛挓 1灏忔椂 2澶�")
+ @ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿鍗曚綅 0鍒嗛挓 1灏忔椂 2澶�")
+ private Integer riskDelayUnit;
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽瀵规柊鍛樺伐宸叉姇淇濇湭鐢熸晥淇濋櫓杩涜淇濋殰 0涓嶅厑璁� 1鍏佽")
+ @ExcelColumn(name="椋庨櫓璁剧疆-鍏佽瀵规柊鍛樺伐宸叉姇淇濇湭鐢熸晥淇濋櫓杩涜淇濋殰 0涓嶅厑璁� 1鍏佽")
+ private Integer riskNewUserStatus;
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 1灏忔椂 2澶�")
+ @ExcelColumn(name="椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 1灏忔椂 2澶�")
+ private Integer riskNewUserUnit;
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂�")
+ @ExcelColumn(name="椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂�")
+ private Integer riskNewUserTime;
+
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏄惁寮�鍚� 0涓嶅厑璁� 1鍏佽")
+ @ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏄惁寮�鍚� 0涓嶅厑璁� 1鍏佽")
+ private Integer riskDelayStatus;
+
+
+ @ApiModelProperty(value = "鎵规敼鎻愰啋鏃堕棿 HH:mm")
+ @ExcelColumn(name="鎵规敼鎻愰啋鏃堕棿")
+ private String correctWarnTime;
+
+
+
+ @ApiModelProperty(value = "淇濋櫓鍏徃鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String insuranceName;
+
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String shopName;
+
+ @ApiModelProperty(value = "宸ョ鍒楄〃 - 鍥炴樉浣跨敤", example = "1")
+ @TableField(exist = false)
+ private List<SolutionWorktype> worktypeList;
+
+ @ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎 - 淇濆瓨浣跨敤", example = "1")
+ @TableField(exist = false)
+ private List<Integer> worktypeIdList;
+
+
+ @ApiModelProperty(value = "淇濆瓨绫诲瀷锛�0姝ｅ父鏁版嵁锛�1椋庨櫓淇℃伅", example = "1")
+ @TableField(exist = false)
+ private Integer saveType;
+
}
--
Gitblit v1.9.3