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 | 5 ++++-
1 files changed, 4 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 422bce9..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,12 @@
@ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅")
private String hpAccountContent;
- @ApiModelProperty(value = "鏍歌禂鎬婚噾棰�")
+ @ApiModelProperty(value = "鏍歌禂涓昏閲戦")
private BigDecimal hpAccount;
+ @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦")
+ private BigDecimal hpOtherAccount;
+
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
--
Gitblit v1.9.3