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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

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

        POINT_TYPE(String desc) {
            this.desc = desc;
@@ -528,7 +529,7 @@
    }

    public enum GROWTH_SOURCE {
        sign("签到"), consume("消费");
        sign("签到"), consume("消费"), downgrading("降级");

        GROWTH_SOURCE(String desc) {
            this.desc = desc;
@@ -554,4 +555,20 @@
            return desc;
        }
    }
    public enum after_sale_type {
        barters("换货"),
        returns("退货"),
        ;

        after_sale_type(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }

}