From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
index 2f2369a..127994e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
@@ -58,6 +58,9 @@
     @ApiModelProperty(value = "鍔犲噺淇濈敵璇风紪鐮侊紙鍏宠仈apply_change)", example = "1")
     @ExcelColumn(name="鍔犲噺淇濈敵璇风紪鐮侊紙鍏宠仈apply_change)")
     private Integer applyChangeId;
+    @ApiModelProperty(value = "鍔犲噺淇濆悎骞跺崟缂栫爜锛堝叧鑱攗nion_change)", example = "1")
+    @ExcelColumn(name="鍔犲噺淇濆悎骞跺崟缂栫爜锛堝叧鑱攗nion_change)")
+    private Integer unionChangeId;
 
     @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攎emeber锛�", example = "1")
     @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攎emeber锛�")
@@ -144,6 +147,10 @@
     @TableField(exist = false)
     private Integer solutionId;
 
+    @ApiModelProperty(value = "鍛樺伐浼佷笟鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
+
     @ApiModelProperty(value = "骞撮緞")
     @TableField(exist = false)
     private long age;

--
Gitblit v1.9.3