Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849

 phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java

@@ -9,4 +9,6 @@
public class MoneyRuleVo {
    /**功能编号*/
    private String functionCode;
    /**金额类型:0增值金,1积分*/
    private Integer moneyType;
}