Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-14 d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe

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

@@ -158,6 +158,8 @@

    public static final String POPULATION_ERROR_LIST = "POPULATION_ERROR_LIST_";

    public static final String BUILDING_ERROR_LIST = "BUILDING_ERROR_LIST_";

    public static final String DRUG_POPULATION_ERROR_LIST = "DRUG_POPULATION_ERROR_LIST_";

    public static final String CORRECT_POPULATION_ERROR_LIST = "CORRECT_POPULATION_ERROR_LIST_";
@@ -186,6 +188,10 @@

    public static final String PENSION_RECORD_ERROR_LIST = "PENSION_RECORD_ERROR_LIST_";

    public static final String CLUSTER_MEMBER_ERROR_LIST = "CLUSTER_MEMBER_ERROR_LIST_";

    public static final String CLUSTER_MEMBER_DEFAULT_IMAGE_URL = "https://www.psciio.com/files/4822602b68af48bcbbea7842aa463227/a6a7882b3fd24d60ac6809fef42d879d.png";

    /**
     * 高德地图获取天气url
     */
@@ -200,4 +206,20 @@
     * 社区议事投票小程序身份验证参数默认key
     */
    public static final String DISCUSS_IDENTITY_KEY = "DISCUSS_IDENTITY_";
    /**
     * 常量
     */
    public static final Integer EIGHTY = 80;
    /**
     * 常量
     */
    public static final Integer NINETY = 90;
    /**
     * 常量
     */
    public static final Integer ONE_HUNDRED = 100;
    /**
     * 字典表民族系统配置码key
     */
    public static final String NATION_DICT_KEY = "nation";
}