From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index b8a13d7..2b55812 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -110,6 +110,10 @@
     @ExcelColumn(name="淇濋櫓鏂规",index =2)
     private String solutionName;
 
+    @ApiModelProperty(value = "鏂规涓婚敭")
+    @TableField(exist = false)
+    private Integer solutionId;
+
     @ApiModelProperty(value = "鎵瑰崟鍙�")
     @TableField(exist = false)
     private String validCode;
@@ -120,7 +124,6 @@
     private String duName;
 
     @ApiModelProperty(value = "鍛樺伐鍚嶇О")
-    @TableField(exist = false)
     @ExcelColumn(name="鍛樺伐濮撳悕",index =3)
     private String memberName;
 

--
Gitblit v1.9.3