From 2f923f848e8c05d6cd5575d2d47966f3f399f512 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 10 七月 2023 14:54:12 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java |    4 +++-
 1 files changed, 3 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..5ec403f 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,8 @@
     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";
 }

--
Gitblit v1.8.0