Merge branch 'cedoodev' into test

CeDo

2021-05-19 575e94e9db7e507ecec2441d24a13e9415fd9f03

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

@@ -124,4 +124,17 @@
    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";

    public static final String AES_KEY="35^*M@dp$5xDB&P@";

    /**
     * 商户平台默认角色权限默认字符串
     */
    public static final String SHOP_ROLE_KEY="shanghupingtai";
    /**
     * 商户平台超级管理员权限默认字符串
     */
    public static final String ADMIN_SHOP_ROLE_KEY="chaojiguanliyuan";
    /**
     * 首页商城是否展示（1.是 2.否）
     */
    public static final Integer IS_SHOP_OPEN = 2;
}