From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index deaa482..d70d3bb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -107,6 +107,9 @@
     /* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
     private Integer opType;
 
+    /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄�  榛樿闇�瑕侀鍙�*/
+    private Integer isReceiveValueAddedFund;
+
 
     /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
     /**

--
Gitblit v1.8.0