Merge branch 'developer' into 'master'

登录测试

See merge request !66

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

@@ -182,7 +182,7 @@ public class LoginController extends WebBaseController{
 		String o = aes.decryptStr(random);
 		if(o == null){
 			logger.info("解密异常");
-			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false,false));
 			return model;
 		}
 		JSONObject jsonObject = JSONObject.parseObject(o);
@@ -191,14 +191,14 @@ public class LoginController extends WebBaseController{
 		EnterpriseDetailDTO detailDTO = wxEnterpriseRelatedApiService.getByEnterpriseId(gicEnterpriseId);
 		if (null == detailDTO) {
 			logger.info("登录失败，不存在对应企业:{}",o);
-			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false,false));
 			return model;
 		}
 		//TODO 获取超级管理员账号接口
 		StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(detailDTO.getWxEnterpriseId(), "86", loginPhoneNumber);
 		if (null == staff) {
 			logger.info("登录用户手机号不存在!{}",o);
-			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false,false));
 			return model;
 		}
 //		StaffDTO staff = staffApiService.selectById("1");