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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java

@@ -12,6 +12,7 @@
    public static final String WX_ORDER_FLAG = "微商城同步订单";
    public static final String ZONGDIAN = "总店";


    private AppConstance() {
    }

@@ -559,9 +560,10 @@
    public static final String APP_BANNER_GL = "APP_BANNER_GL";





    /**
     * 是否管理产品库存
     */
    public static final String WAREHOUSE_MANAGE_STOCK = "WAREHOUSE_MANAGE_STOCK";