Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/DeviceQueryRequestDTO.java

@@ -33,7 +33,7 @@ public class DeviceQueryRequestDTO extends AbstractBizRequestDTO {
     @NotBlank
     @ApiModelProperty(value = "身份证号")
     private String customerIdNum;// 身份证号
-    @NotBlank
+//    @NotBlank
     @ApiModelProperty(value = "行驶证车辆类型")
     private String cardVehicleType;// 行驶证车辆类型
     @NotBlank
@@ -64,7 +64,7 @@ public class DeviceQueryRequestDTO extends AbstractBizRequestDTO {
     @Size(max = 16)
     @ApiModelProperty(value = "obu编号")
     private String obuId;//obu编号;
-    @NotBlank
+//    @NotBlank
     @ApiModelProperty(value = "行驶证车辆类型")
     private String obuVehicleType;//行驶证车辆类型
     @NotNull

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/portal/LoginByCodeManager.java

@@ -38,7 +38,7 @@ public class LoginByCodeManager extends AbstractLoginManager implements LogManag
             if (!smsCode.equals(request.getCode()))
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("短信验证码错误！");
             AccountInfo accountInfo = accountInfoRepo.findByAccount(request.getMobile());
-            if (accountInfo == null) throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("手机号输入错误");
+            if (accountInfo == null) throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("账号不存在");
             findAndValidStaff(accountInfo.getOpenId(), request.getLoginSource());
             String code = UUID.randomUUID().toString().replaceAll("-", "");// code用于换Token，还完Token就没用了
             redisManager.set(RedisKeyGenerator.getLoginOpenIdByCodeKey(code, request.getLoginSource().name()), accountInfo.getOpenId(), LoginCacheFinals.LOGIN_CODE_EXPIRED, TimeUnit.MINUTES);