Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 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;
}