Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -157,7 +157,21 @@

    public static final String CORRECT_POPULATION_ERROR_LIST = "CORRECT_POPULATION_ERROR_LIST_";

    public static final String Major_POPULATION_ERROR_LIST = "Major_POPULATION_ERROR_LIST_";
    public static final String MAJOR_POPULATION_ERROR_LIST = "MAJOR_POPULATION_ERROR_LIST_";

    public static final String CULT_POPULATION_ERROR_LIST = "CULT_POPULATION_ERROR_LIST_";

    public static final String REHABILITATION_POPULATION_ERROR_LIST = "REHABILITATION_POPULATION_ERROR_LIST_";

    public static final String KEY_POPULATION_ERROR_LIST = "KEY_POPULATION_ERROR_LIST_";

    public static final String SENTENCE_POPULATION_ERROR_LIST = "SENTENCE_POPULATION_ERROR_LIST_";

    public static final String VETERANS_POPULATION_ERROR_LIST = "VETERANS_POPULATION_ERROR_LIST_";

    public static final String DISABILITY_POPULATION_ERROR_LIST = "DISABILITY_POPULATION_ERROR_LIST_";

    public static final String LOWSECURITY_POPULATION_ERROR_LIST = "LOWSECURITY_POPULATION_ERROR_LIST_";

    /**
     * 高德地图获取天气url