From 277f2d65a70bddbf9c571e2023315faad26e12d0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 14:11:44 +0800
Subject: [PATCH] Merge branch 'master' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 11 +++++++++++
1 files changed, 11 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 e69641a..0a023a4 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锛�")
@@ -140,5 +143,13 @@
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜", example = "1")
@TableField(exist = false)
private Integer applyId;
+ @ApiModelProperty(value = "鏂规涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer solutionId;
+
+ @ApiModelProperty(value = "骞撮緞")
+ @TableField(exist = false)
+ private long age;
+
}
--
Gitblit v1.9.3