From 81873468b3453cab461b98368a630d7bcf97a15c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 11:33:01 +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/UnionApply.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
index 80ad3ac..0ff462e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
@@ -84,8 +84,8 @@
@ExcelColumn(name="鍗曞彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥�")
+ @ApiModelProperty(value = "鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥� 5寰呭瀹�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥� 5寰呭瀹�")
private Integer status;
@ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
@@ -104,6 +104,11 @@
@ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
private Integer solutionId;
+
+ @ApiModelProperty(value = "澶嶅瀹℃壒浜�", example = "1")
+ @ExcelColumn(name="澶嶅瀹℃壒浜�")
+ private Integer retrialId;
+
@ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
@@ -115,6 +120,17 @@
@TableField(exist = false)
private String solutionName;
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer delOnlyReplace;
+
+ @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 = "鏌ヨ寮�濮嬫棩鏈�", example = "1")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
@@ -131,6 +147,10 @@
@ApiModelProperty(value = "鏈嶅姟澶╂暟")
@TableField(exist = false)
private Integer serviceDays;
+
+ @ApiModelProperty(value = "鍙煡璇㈠緟澶勭悊鐨勭敵璇峰崟锛�1=鍔犲噺淇濓紱2=鎹㈠巶")
+ @TableField(exist = false)
+ private Integer hasApplying;
@ApiModelProperty(value = "鎶曚繚浜烘暟")
@TableField(exist = false)
@@ -182,6 +202,10 @@
private Integer changeApplyNum;
+ @ApiModelProperty(value = "鏌ヨ鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗曪紙淇濋殰涓級 4宸查��鍥� 5宸蹭笂浼犳壒鍗曪紙寰呯敓鏁堬級 6宸蹭笂浼犳壒鍗曪紙宸茶繃鏈燂級", example = "1")
+ @TableField(exist = false)
+ private Integer queryStatus;
+
@ApiModelProperty(value = "鏃ュ織璁板綍")
@TableField(exist = false)
--
Gitblit v1.9.3