Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

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

@@ -133,4 +133,8 @@
     * 商户平台超级管理员权限默认字符串
     */
    public static final String ADMIN_SHOP_ROLE_KEY="chaojiguanliyuan";
    /**
     * 首页商城是否展示（1.是 2.否）
     */
    public static final Integer IS_SHOP_OPEN = 2;
}