From e70eb0a8b1330eacd21ce17478f04fde3b8f7939 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 20 五月 2025 11:30:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 13 ++++++++++++- 1 files changed, 12 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 7694fc1..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 @@ -142,7 +142,7 @@ @TableField(exist = false) private String validCode; - @ApiModelProperty(value = "淇濋殰鐘舵�侊細0=淇濋殰涓紱1=涓嶅湪淇�") + @ApiModelProperty(value = "淇濋殰鐘舵�侊細-1=鐢宠涓紱0=淇濋殰涓紱1=涓嶅湪淇濓紱2=鏈敓鏁�") @TableField(exist = false) private Integer applyStatus; @@ -173,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