From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java |    7 ++++++-
 1 files changed, 6 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 2586260..d0af736 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
@@ -90,7 +90,7 @@
     /**
      * 令牌有效期(分钟)
      */
-    public final static long TOKEN_EXPIRE = 720;
+    public final static long _EXPIRE = 720;
 
     /**
      * 参数管理 cache key
@@ -137,4 +137,9 @@
      * 首页商城是否展示(1.是 2.否)
      */
     public static final Integer IS_SHOP_OPEN = 2;
+
+    /**
+     * 网格综治-默认角色权限默认字符串
+     */
+    public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";
 }

--
Gitblit v1.7.1