Merge branch 'master' into master-test

fwq

2023-09-26 e3fe83d7676c8f954564a7fb90e82295b3da2fee

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java

@@ -99,4 +99,6 @@
    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";
}