Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

 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;