Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-02 b977bf61c82b7dc39079974d7316b7a80cf520fa

 src/main/java/com/mzl/flower/constant/Constants.java

@@ -10,6 +10,8 @@

    public static final String DEFAULT_PASSWORD = "1234562";

    public static final String DEFAULT_MEMBER_ID = "1"; //默认会员等级


    /**
     * 审核结果
@@ -481,7 +483,8 @@
        activity("活动获取"),
        giveaway("积分赠送"),
        deduction("积分扣减"),
        exchange("积分兑换");
        exchange("积分兑换"),
        expired("积分过期");

        POINT_TYPE(String desc) {
            this.desc = desc;