From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +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/Insurance.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
index 84d182a..692d123 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.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;
/**
* 淇濋櫓鍏徃淇℃伅琛�
@@ -31,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -67,12 +69,71 @@
@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")
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
+ @ExcelColumn(name="濮旀墭鍟嗘埛缂栫爜锛堝叧鑱攃ompany锛�")
+ private Integer shopId;
+ @ApiModelProperty(value = "宸ョ闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Worktype> worktypeList;
+ @ApiModelProperty(value = "LOGO鍥炬爣", example = "1")
+ @ExcelColumn(name="LOGO鍥炬爣")
+ private String logo;
+
+ @ApiModelProperty(value = "LOGO鍥炬爣", example = "1")
+ @TableField(exist = false)
+ private String logoFullUrl;
+
+ @ApiModelProperty(value = "鑻辨枃鍚嶇О", example = "1")
+ @ExcelColumn(name="鑻辨枃鍚嶇О")
+ private String englishName;
+ @ApiModelProperty(value = "鑱旂郴浜�", example = "1")
+ @ExcelColumn(name="鑱旂郴浜�")
+ private String linkName;
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�", example = "1")
+ @ExcelColumn(name="鑱旂郴浜虹數璇�")
+ private String linkPhone;
+ @ApiModelProperty(value = "淇濋櫓鏀跨瓥", example = "1")
+ @ExcelColumn(name="淇濋櫓鏀跨瓥")
+ private String policy;
+ @ApiModelProperty(value = "淇濋櫓鏉℃", example = "1")
+ @ExcelColumn(name="淇濋櫓鏉℃")
+ private String agreement;
+ @ApiModelProperty(value = "鐞嗚禂璧勬枡", example = "1")
+ @ExcelColumn(name="鐞嗚禂璧勬枡")
+ private String claimsInformation;
+
+ @ApiModelProperty(value = "鐞嗚禂鏂囦欢鐘舵�侊細0=鍚︼紱1=鏄紱", example = "1")
+ private Integer lpFileStatus;
+
+ @ApiModelProperty(value = "鐞嗚禂鍛樺伐鍏崇郴璇佹槑鏂囦欢涓婁紶璇存槑", example = "1")
+ private String lpYggxFileInfo;
+
+ @ApiModelProperty(value = "鐞嗚禂闂ㄨ瘖鏂囦欢涓婁紶璇存槑", example = "1")
+ private String lpMzFileInfo;
+
+ @ApiModelProperty(value = "鐞嗚禂浣忛櫌鏂囦欢涓婁紶璇存槑", example = "1")
+ private String lpZyFileInfo;
+
+ @ApiModelProperty(value = "鐞嗚禂浼ゆ畫鏂囦欢涓婁紶璇存槑", example = "1")
+ private String lpScFileInfo;
+
+ @ApiModelProperty(value = "鐞嗚禂鍏朵粬鏂囦欢涓婁紶璇存槑", example = "1")
+ private String lpOtherFileInfo;
+
+
+ @ApiModelProperty(value = "鐩栫珷妯℃澘鏂囦欢", example = "1")
+ @TableField(exist = false)
+ private Multifile lpStampTempFile;
+
+ @ApiModelProperty(value = "鐞嗚禂鏂囦欢", example = "1")
+ @TableField(exist = false)
+ private Multifile lpFile;
}
--
Gitblit v1.9.3