From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 9ff8fe9..8d21705 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
@@ -133,6 +133,10 @@
*/
public static final String ADMIN_SHOP_ROLE_KEY = "chaojiguanliyuan";
/**
+ * 便民服务商户默认角色权限默认字符串
+ */
+ public static final String CONVENIENT_MERCHANT_ROLE_KEY = "convenient_merchant_platform";
+ /**
* 首页商城是否展示（1.是 2.否）
*/
public static final Integer IS_SHOP_OPEN = 2;
@@ -174,6 +178,14 @@
public static final String LOWSECURITY_POPULATION_ERROR_LIST = "LOWSECURITY_POPULATION_ERROR_LIST_";
+ public static final String ELDER_POPULATION_ERROR_LIST = "ELDER_POPULATION_ERROR_LIST_";
+
+ public static final String PENSION_POPULATION_ERROR_LIST = "PENSION_POPULATION_ERROR_LIST_";
+
+ public static final String ELDER_RECORD_ERROR_LIST = "ELDER_RECORD_ERROR_LIST_";
+
+ public static final String PENSION_RECORD_ERROR_LIST = "PENSION_RECORD_ERROR_LIST_";
+
/**
* 高德地图获取天气url
*/
@@ -183,4 +195,21 @@
* 高德地图获取天气key
*/
public static final String G_D_WEATHER_KEY = "02019a956b118ac7956c8539ab02b0f5";
+
+ /**
+ * 社区议事投票小程序身份验证参数默认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;
}
--
Gitblit v1.7.1