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/SettleClaims.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 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 403cc6d..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 @@ -241,6 +241,18 @@ @ApiModelProperty(value = "妗堜欢绫诲瀷锛�0=鏈缃紱1=鍖荤枟锛�2=浼ゆ畫锛�3=姝讳骸") private Integer caseType; + + @ApiModelProperty(value = "鏍歌禂鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t") + @ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅") + private String hpAccountContent; + + @ApiModelProperty(value = "鏍歌禂涓昏閲戦") + private BigDecimal hpAccount; + + @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦") + private BigDecimal hpOtherAccount; + + @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�") @TableField(exist = false) private Multifile baoxiandanFile; -- Gitblit v1.9.3