From 81873468b3453cab461b98368a630d7bcf97a15c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 20 五月 2025 11:33:01 +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/SettleClaims.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java index 4f5eafa..5c0f182 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java @@ -246,9 +246,13 @@ @ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅") private String hpAccountContent; - @ApiModelProperty(value = "鏍歌禂鎬婚噾棰�") + @ApiModelProperty(value = "鏍歌禂涓昏閲戦") private BigDecimal hpAccount; + @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦") + private BigDecimal hpOtherAccount; + + @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�") @TableField(exist = false) private Multifile baoxiandanFile; -- Gitblit v1.9.3