From 31a92b9692298472b62f8f0727b7b7fca0e87f00 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 04 五月 2023 11:25:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
index d4e3418..6abd3fa 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
@@ -2,13 +2,13 @@
import lombok.Data;
-/**鐢ㄦ埛鎷ユ湁鏌ヨ瀹炰綋*/
+/**鏌ヨ瀹炰綋*/
@Data
public class UserHaveDto {
/**phis鐢ㄦ埛鏍囪瘑*/
private String userId;
- /*************浼樻儬鍒告煡璇㈠弬鏁�******************/
+ /*************浼樻儬鍒告煡璇㈠弬鏁�************************/
/**鏄惁鏈夋晥*/
private Integer validState;
/**鏄惁杩囨湡*/
@@ -18,11 +18,22 @@
/**骞冲彴*/
private String platform;
- /************棰勭害鏌ヨ鍙傛暟***************************/
+ /************棰勭害鏌ヨ鍙傛暟*************************/
/**鏄惁鍒板簵*/
private Integer isArrive;
/************椤圭洰鏌ヨ鍙傛暟**************************/
/**鏄惁鏈嶅姟*/
private Integer isService;
+
+ /************寰呴鍙栬祫閲戞煡璇�************************/
+ /**璧勯噾绫诲瀷:0鍌ㄥ�奸噾1澧炲�奸噾2绉垎3棰勫畾閲�*/
+ private Integer fundType;
+ /**鐘舵��0 绛夊緟澶勭悊 1 澶勭悊鎴愬姛*/
+ private Integer status;
+ /**鏄惁鏈夋晥*/
+ private Integer isValid;
+ /**鏄惁杩囨湡*/
+ private Integer moneyExpired;
+
}
--
Gitblit v1.8.0