Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -90,7 +90,7 @@
    /**
     * 令牌有效期（分钟）
     */
    public final static long _EXPIRE = 720;
    public final static long TOKEN_EXPIRE = 720;

    /**
     * 参数管理 cache key
@@ -142,4 +142,6 @@
     * 网格综治-默认角色权限默认字符串
     */
    public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";

    public static final String ZONG_ZHI_GRID_MEMBER_IMAGE_URL = "https://www.psciio.com//idcard/57bf4104a76741cfabfead0bb8218307.jpg";
}