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 | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 8b18b83..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
@@ -18,7 +18,7 @@
* @date 2024/10/28 19:16
*/
@Data
-@ApiModel("淇濋櫓鏂规淇℃伅琛�")
+@ApiModel("淇濋櫓涓绘柟妗堜俊鎭〃")
@TableName("`solutions_base`")
public class SolutionsBase {
@@ -151,19 +151,25 @@
@ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿")
@ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿")
- private String riskDelayTime;
+ private Integer riskDelayTime;
@ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿鍗曚綅 0鍒嗛挓 1灏忔椂 2澶�")
@ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏃堕棿鍗曚綅 0鍒嗛挓 1灏忔椂 2澶�")
- private String riskDelayUnit;
+ private Integer riskDelayUnit;
@ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽瀵规柊鍛樺伐宸叉姇淇濇湭鐢熸晥淇濋櫓杩涜淇濋殰 0涓嶅厑璁� 1鍏佽")
@ExcelColumn(name="椋庨櫓璁剧疆-鍏佽瀵规柊鍛樺伐宸叉姇淇濇湭鐢熸晥淇濋櫓杩涜淇濋殰 0涓嶅厑璁� 1鍏佽")
- private String riskNewUserStatus;
- @ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 0鍒嗛挓 1灏忔椂 2澶�")
- @ExcelColumn(name="椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 0鍒嗛挓 1灏忔椂 2澶�")
- private String riskNewUserUnit;
+ private Integer riskNewUserStatus;
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 1灏忔椂 2澶�")
+ @ExcelColumn(name="椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂村崟浣� 1灏忔椂 2澶�")
+ private Integer riskNewUserUnit;
@ApiModelProperty(value = "椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂�")
@ExcelColumn(name="椋庨櫓璁剧疆-鍏佽鏂板憳宸ュ嚭闄╂椂闂存彁鍓嶆椂闂�")
- private String riskNewUserTime;
+ private Integer riskNewUserTime;
+
+ @ApiModelProperty(value = "椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏄惁寮�鍚� 0涓嶅厑璁� 1鍏佽")
+ @ExcelColumn(name="椋庨櫓璁剧疆-寤惰繜鎶ユ鎻愰啋鏄惁寮�鍚� 0涓嶅厑璁� 1鍏佽")
+ private Integer riskDelayStatus;
+
+
@ApiModelProperty(value = "鎵规敼鎻愰啋鏃堕棿 HH:mm")
@ExcelColumn(name="鎵规敼鎻愰啋鏃堕棿")
private String correctWarnTime;
@@ -186,4 +192,9 @@
@TableField(exist = false)
private List<Integer> worktypeIdList;
+
+ @ApiModelProperty(value = "淇濆瓨绫诲瀷锛�0姝ｅ父鏁版嵁锛�1椋庨櫓淇℃伅", example = "1")
+ @TableField(exist = false)
+ private Integer saveType;
+
}
--
Gitblit v1.9.3