Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-11 f417d6b965a16fb197ac8c49b383fbeedd28e23d

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -37,6 +37,7 @@
    public static final String PROJECTS = "PROJECTS";
    public static final String CATEGORY_IMG = "CATEGORY_IMG";
    public static final String GOODS_IMG ="GOODS_IMG" ;
    public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE";

    /**
     * 企业数据来源 0平台注册 1后台导入
@@ -650,6 +651,40 @@
        }
    }


    public enum goodsType {

        /** 用户启用禁用枚举值*/
        CREATE(0,"自建"),
        PULL(1,"拉取");

        private  Integer value;
        private  String des;


        goodsType(Integer value, String des) {
            this.value = value;
            this.des = des;
        }

        public Integer getValue() {
            return value;
        }

        public void setValue(Integer value) {
            this.value = value;
        }

        public String getDes() {
            return des;
        }

        public void setDes(String des) {
            this.des = des;
        }
    }


    public enum CompanyType{

        BUSINESS_COMPANYTYPE(0,"企业"),