fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -168,17 +168,13 @@ public class CommonController extends BaseController {
     @Autowired
     private ICertificateTpService iCertificateTpService;
 
-<<<<<<< HEAD
-
     @Autowired
     private IZsBankService iZsBankService;
-=======
     @Autowired
     private ClassGradeUserMapper classGradeUserMapper;
 
     @Autowired
     private IMajorService iMajorService;
->>>>>>> dangAn
     /**
      * 通用下载请求
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1755,32 +1755,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 share = sysTenant.getShareClass();
             }
         }
-        
+
         if(Validator.isEmpty(user)){
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
             //判断旧系统是否有账号
-<<<<<<< HEAD
             if (share > 0){
                 oldAccountLogin(bo,1);
             }else {
                 throw new CustomException("登录信息错误");
             }
-=======
-            oldAccountLogin(bo,1);
->>>>>>> dangAn
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             //判断旧系统是否有账号
-<<<<<<< HEAD
             if (share > 0){
                 oldAccountLogin(bo,1);
             }else {
                 throw new CustomException("对不起，您的账号：已停用");
             }
-=======
-            oldAccountLogin(bo,1);
->>>>>>> dangAn
         }
         String password = null;
         if(bo.getPwd().length()>20){