From 74570c3c6b01ef869824030ad110e6b930fa5e08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 ae41fab..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;
@@ -191,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