From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 2574514..a1a41fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -95,6 +95,10 @@
     public static final String OPERATION_REASON_CHANGE = "changeGoods";
     /**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
     public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
-
+    /**鎿嶄綔鏂瑰紡-鑰佸甫鏂拌禒閫�0701*/
     public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
+    /**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
+    public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
+    /**鎿嶄綔鏂瑰紡-钀ラ攢鍔╂墜绉垎鍏戞崲浼樻儬鍒�*/
+    public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
 }

--
Gitblit v1.8.0