From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +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/InsuranceApply.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 4bce582..0555a2a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -78,7 +78,7 @@
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
// @JsonFormat(pattern="yyyy-MM-dd")
- private Date applyStartTime;
+ private Date applyStartTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@@ -154,6 +154,8 @@
// @JsonFormat(pattern="yyyy-MM-dd")
private Date finalEndTime;
+ @ApiModelProperty(value = "澶嶅浜轰富閿�")
+ private Integer retrialId;
@ApiModelProperty(value = "浼佷笟鍚嶇О")
@TableField(exist = false)
@@ -162,6 +164,19 @@
@ApiModelProperty(value = "鏂规鍚嶇О")
@TableField(exist = false)
private String solutionsName;
+
+ @ApiModelProperty(value = "鏄惁鏈夋淳閬ｅ崟浣� 0鏈� 1鏃�", example = "1")
+ @TableField(exist = false)
+ private Integer hasDispatchUnit;
+
+ @ApiModelProperty(value = "濮旀墭鏂规绛剧珷鏂瑰紡 0浼佷笟绛剧讲鍟嗘埛涓婁紶鎶曚繚鍗� 1浼佷笟绛炬姇淇濈敵璇� 2浼佷笟鏃犻渶绛剧珷", example = "1")
+ @TableField(exist = false)
+ private Integer signType;
+
+ @ApiModelProperty(value = "鎵规敼鎻愰啋鏃堕棿 HH:mm")
+ @TableField(exist = false)
+ private String correctWarnTime;
+
@ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
@TableField(exist = false)
private Integer solutionType;
@@ -179,6 +194,11 @@
@ApiModelProperty(value = "鎶曚繚浜烘暟")
@TableField(exist = false)
private Integer insureNum;
+
+ @ApiModelProperty(value = "鍦ㄤ繚浜烘暟")
+ @TableField(exist = false)
+ private Integer guaranteeNum;
+
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
@TableField(exist = false)
@@ -247,6 +267,11 @@
@TableField(exist = false)
private Integer timeUnit;
+
+ @ApiModelProperty(value = "鎵规敼鎬婚噾棰�")
+ @TableField(exist = false)
+ private BigDecimal changeMoney;
+
@ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1")
@TableField(exist = false)
private Integer solutionBaseId;
@@ -274,7 +299,4 @@
return taxesInvoicingVO;
}
- @ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍦板潃")
- @TableField(exist = false)
- private String signLink;
}
--
Gitblit v1.9.3