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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

@@ -555,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;
        }
    }

}