From 87f6cce44f87f9df74ef737ea831bed9ceed490c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 14 四月 2022 09:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index 4645490..117100d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -2,7 +2,7 @@
/**
* 通用常量信息
- *
+ *
* @author HUANGHONGFA
*/
public class Constants {
@@ -137,6 +137,10 @@
*/
public static final String CONVENIENT_MERCHANT_ROLE_KEY = "convenient_merchant_platform";
/**
+ * 街道超级管理员
+ */
+ public static final String STREET_ROLE_KEY="street_member";
+ /**
* 首页商城是否展示（1.是 2.否）
*/
public static final Integer IS_SHOP_OPEN = 2;
@@ -157,6 +161,8 @@
public static final String INTEGRAL_EXPLAIN = "积分说明";
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_";
@@ -188,7 +194,16 @@
public static final String CLUSTER_MEMBER_ERROR_LIST = "CLUSTER_MEMBER_ERROR_LIST_";
+ public static final String COM_MNG_VOLUNTEER_ERROR_LIST = "COM_MNG_VOLUNTEER_ERROR_LIST_";
+
+ public static final String PB_CHECK_UNIT_ERROR_LIST = "PB_CHECK_UNIT_ERROR_LIST_";
+
+ public static final String PB_MEMBER_ROLE_ERROR_LIST = "PB_MEMBER_ROLE_ERROR_LIST_";
+
public static final String CLUSTER_MEMBER_DEFAULT_IMAGE_URL = "https://www.psciio.com/files/4822602b68af48bcbbea7842aa463227/a6a7882b3fd24d60ac6809fef42d879d.png";
+
+ public static final String FMS_MEMBER_ERROR_LIST = "FMS_MEMBER_ERROR_LIST_";
+ public static final String FMS_SERVICE_ERROR_LIST = "FMS_SERVICE_ERROR_LIST_";
/**
* 高德地图获取天气url
@@ -220,4 +235,12 @@
* 字典表民族系统配置码key
*/
public static final String NATION_DICT_KEY = "nation";
+ /**
+ * 党建包名
+ */
+ public static final String SERVICE_PARTYBUILDING = "partybuilding";
+ /**
+ * service_community包
+ */
+ public static final String SERVICE_COMMUNITY = "community";
}
--
Gitblit v1.7.1