From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 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 3647d7c..8b41529 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
@@ -108,6 +108,19 @@
 //    @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪")
     private Integer fromId;
 
+    @ApiModelProperty(value = "鍑忓皯璐圭敤")
+//    @ExcelColumn(name="褰撳墠璐圭敤")
+    private BigDecimal reduceMoney;
+
+    @ApiModelProperty(value = "鍔犱繚涓氬姟缁戝畾鐨勫噺淇濇暟鎹富閿�")
+//    @ExcelColumn(name="褰撳墠璐圭敤")
+    private Integer reduceId;
+
+    @ApiModelProperty(value = "鍔犲噺淇濇暟鎹姸鎬侊細0=姝e父锛�1=涓嶅彲鍑忎繚锛�2=鍑忎繚宸插彇娑�")
+//    @ExcelColumn(name="褰撳墠璐圭敤")
+    private Integer changeStatus;
+
+
     @ApiModelProperty(value = "淇濆崟鍙�")
     @TableField(exist = false)
     private String applyCode;
@@ -117,6 +130,10 @@
     @ExcelColumn(name="淇濋櫓鏂规",index =2,width = 10)
     private String solutionName;
 
+    @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+    @TableField(exist = false)
+    private Integer solutionType;
+
     @ApiModelProperty(value = "鏂规涓婚敭")
     @TableField(exist = false)
     private Integer solutionId;
@@ -125,9 +142,18 @@
     @TableField(exist = false)
     private String validCode;
 
-    @ApiModelProperty(value = "淇濋殰鐘舵�侊細0=淇濋殰涓紱1=涓嶅湪淇�")
+    @ApiModelProperty(value = "淇濋殰鐘舵�侊細-1=鐢宠涓紱0=淇濋殰涓紱1=涓嶅湪淇濓紱2=鏈敓鏁�")
     @TableField(exist = false)
     private Integer applyStatus;
+
+    @ApiModelProperty(value = "鏄惁鏄鍑猴紱0=鍚︼紱1=鏄�",hidden = true)
+    @TableField(exist = false)
+    private Integer isExcel;
+
+
+    @ApiModelProperty(value = "淇濆崟鐘舵��")
+    @TableField(exist = false)
+    private Integer status;
 
     @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
     @TableField(exist = false)
@@ -147,4 +173,15 @@
     @TableField(exist = false)
     private String companyName;
 
+    @ApiModelProperty(value = "淇濆崟鏄庣粏琛屾湇鍔¤垂")
+    @TableField(exist = false)
+    private BigDecimal detailServerCost;
+
+    @ApiModelProperty(value = "琛屼繚闄╃敓鏁堟鏈�")
+    @TableField(exist = false)
+    private Date parentEndTime;
+
+    @ApiModelProperty(value = "琛屼繚闄╃敓鏁堣捣鏈�")
+    @TableField(exist = false)
+    private Date parentStartTime;
 }

--
Gitblit v1.9.3