From a5ef1518e11684ec903cbe0b6952403ef9297d0e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 11:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 2c34cfc..d8e1c54 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,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 淇濋櫓鏂规淇℃伅琛�
@@ -99,8 +101,8 @@
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
- @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
- @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
+ @ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2褰撳墠鍚敤鐗堟湰", example = "1")
+ @ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁 2褰撳墠鍚敤鐗堟湰")
private Integer dataType;
@ApiModelProperty(value = "鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
@@ -147,4 +149,47 @@
@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;
+
}
--
Gitblit v1.9.3