Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 java110-utils/src/main/java/com/java110/utils/constant/StoreTypeConstant.java

old mode 100644
new mode 100755
@@ -32,9 +32,9 @@
    public final static String STORE_TYPE_LOGISTICS_COMPANY = "800900000004";

    /**
     * 超市
     * 商家
     */
    public final static String STORE_TYPE_SUPER_MARKET = "800900000005";
    public final static String STORE_TYPE_MALL = "800900000005";

    /**
     * 餐厅