Commit 7d220d92 by 墨竹

fix:合并代码

parent 0f25fc60
...@@ -197,7 +197,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -197,7 +197,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String staffId = staffLoginQO.getStaffId(); String staffId = staffLoginQO.getStaffId();
String wxOpenUseId = staffLoginQO.getWxOpenUseId(); String wxOpenUseId = staffLoginQO.getWxOpenUseId();
//-1 代表游客登录 //-1 代表游客登录
if ("-1".equals(staffId) || StringUtils.isBlank(staffId)) { if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
return wellDoneTouristsLogin(staffLoginQO, request, staffId, wxOpenUseId); return wellDoneTouristsLogin(staffLoginQO, request, staffId, wxOpenUseId);
} }
//用户登录 //用户登录
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment