Merge branch 'feature_0711' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -115,7 +115,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (user == null) {
             return resultResponse(HaoBanErrCode.ERR_6);
         }
-        String userId = user.getOpen_userid();
+        String userId = user.getUserid();
         String corpId = user.getCorpid();
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         StaffDTO loginStaff = null;