From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 c1a58a2..d88ad9c 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
@@ -88,6 +88,7 @@
@ApiModelProperty(value = "璐圭敤", example = "1")
@ExcelColumn(name="璐圭敤")
private BigDecimal fee;
+
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
@ExcelColumn(name="瀹℃牳鏃堕棿")
@@ -104,7 +105,7 @@
@ExcelColumn(name="鍗曞彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級 2纭璧勬枡锛堝鐞嗕腑锛� 3瀹屾垚鍙楃悊锛堝凡缁撴锛�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 寮冪敤(0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級2鍙楃悊涓� 3纭璧勬枡锛堝鐞嗕腑锛� 4瀹屾垚鍙楃悊锛堝凡缁撴锛�) 5寰呭彈鐞� 6鍙楃悊閫�鍥� 7寰呭晢璁� 8鍟嗚寰呭鎵� 9鍟嗚瀹℃壒鎷掔粷 10宸插彈鐞�", example = "1")
@ExcelColumn(name="鐘舵�� 0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級 2纭璧勬枡锛堝鐞嗕腑锛� 3瀹屾垚鍙楃悊锛堝凡缁撴锛�")
private Integer status;
@@ -112,8 +113,8 @@
@ExcelColumn(name="浜嬫晠绫诲瀷 0宸ヤ綔鏈熼棿鍙椾激 1涓婁笅鐝�斾腑鍙椾激 2闈炲伐浣滄椂闂村彈浼� 3鎰忓鍙椾激")
private Integer type;
- @ApiModelProperty(value = "鏄惁浣忛櫌 0鏄� 1鍚�", example = "1")
- @ExcelColumn(name="鏄惁浣忛櫌 0鏄� 1鍚�")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖", example = "1")
+ @ExcelColumn(name="灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖")
private Integer inHospital;
@ApiModelProperty(value = "鏄惁鏈夊尰鐤椾繚闄� 0鏄� 1鍚�", example = "1")
@@ -181,19 +182,19 @@
private String syProblemOpts;
@ApiModelProperty(value = "鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
@ExcelColumn(name="鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
- private String isRisk;
+ private Integer isRisk;
@ApiModelProperty(value = "鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
@ExcelColumn(name="鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
- private String riskTimesCx;
+ private Integer riskTimesCx;
@ApiModelProperty(value = "鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
@ExcelColumn(name="鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
- private String riskRepeat;
+ private Integer riskRepeat;
@ApiModelProperty(value = "鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
@ExcelColumn(name="鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
- private String riskTimesSp;
+ private Integer riskTimesSp;
@ApiModelProperty(value = "鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
@ExcelColumn(name="鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
- private String riskNewUser ;
+ private Integer riskNewUser ;
@ApiModelProperty(value = "璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
private String riskSensitive;
@@ -212,6 +213,24 @@
@ApiModelProperty(value = "鏁翠綋鐘舵�� 0鏈彁浜� 1寰呯珛妗� 2寰呭彈鐞� 3")
@ExcelColumn(name="鏁翠綋鐘舵��")
private String allStatus;
+
+ @ApiModelProperty(value = "鏀舵閾惰")
+ @ExcelColumn(name="鏀舵閾惰")
+ private String receiveBank;
+
+ @ApiModelProperty(value = "鏀舵浜�")
+ @ExcelColumn(name="鏀舵浜�")
+ private String receiveUserName;
+
+ @ApiModelProperty(value = "鏀舵璐︽埛")
+ @ExcelColumn(name="鏀舵璐︽埛")
+ private String receiveAccount;
+
+
+
+
+
+
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
private Multifile baoxiandanFile;
--
Gitblit v1.9.3