From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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..0d70646 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,24 @@
@ExcelColumn(name="鎵垮寘鍏徃")
private String companyName;
+ @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