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

doum

昨天 145dbc2a4f5bafcb432fb35d7bc91101aa3318d8

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

@@ -171,6 +171,7 @@
    public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
    public static final String OUT_HY_LOT_TOTAL ="OUT_HY_LOT_TOTAL" ;
    public static final String BANNER_IMG ="BANNER_IMG" ;
    public static final String COMPANY_LOCATION = "COMPANY_LOCATION";
    public static final String GAODE_LOCATION_GEOAPI_URL = "GAODE_LOCATION_GEOAPI_URL";

    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
@@ -530,6 +531,7 @@
    public interface RedisKeys {
        public static final String IMPORTING_CARS ="IMPORTING_CARS";
        public static final String CHECKING_JKCUSTOMER_LOCATION ="CHECKING_JKCUSTOMER_LOCATION";
        public static final String JKLINE_JOB ="JKLINE_JOB_";
        public static final String IMPORTING_JKCUSTOMER ="IMPORTING_JKCUSTOMER";
        public static final String IMPORTING_JKORDERS ="IMPORTING_JKORDERS";
        public static final String IMPORTING_JKLINE ="IMPORTING_JKLINE";