From 2e2a241d0365acf73dfe17087f2541b1a1edb337 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 18 十月 2021 18:05:23 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 6 ++++++
1 files changed, 6 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 62cb780..0cf9a19 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;
@@ -154,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_";
--
Gitblit v1.7.1