Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

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

@@ -124,4 +124,13 @@
    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";
}