From bb32acfe7b46f4353007233755dd417fce7f952e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 12 三月 2024 11:57:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index a9025e9..61deb0b 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -89,7 +89,9 @@
     @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�)  5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
     @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�)  5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
     private Integer status;
-
+    @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)", example = "1")
+    @ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)")
+    private Integer unionChange;
     @ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
     private String signApplyNo;
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")

--
Gitblit v1.9.3