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

张天森

2022-11-10 d99a56e37cf9109b46ee68d34a06594ef5615ed3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -139,8 +139,11 @@
    }

    public String getAppId(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return loginUserInfo.getAppId();
        String appid = this.getRequest().getHeader("appid");
        if(StringUtils.isEmpty(appid)){
            return "wx0cef797390444b75";
        }
        return appid;
    }

    public String getAppSecret(){