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

935090232@qq.com

2021-05-16 8c7508388bad1234b731e0fc59afa095db0fda1b

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

@@ -521,7 +521,7 @@
    /**
     * 免免邮金额
     */
    public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
        public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";


    /**