no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/quality/QualityFeedbackVO.java

@@ -41,6 +41,10 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "外机条码")
     private String outCode;
 
+    @ZfireField(type = "select", frontCode = "PRODUCT_CATEGORY", isShow = false)
+    @ApiModelProperty(value = "产品大类")
+    private String mainId;
+
     @ApiModelProperty(value = "产品大类名称")
     private String mainName;
 
@@ -100,10 +104,6 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "详细地址")
     private String joinAddress;
 
-    @ZfireField(type = "select", frontCode = "PRODUCT_CATEGORY", isShow = false)
-    @ApiModelProperty(value = "产品大类")
-    private String mainId;
-
     @ZfireField(type = "select", frontCode = "PRODUCT_SUBCLASS", isShow = false)
     @ApiModelProperty(value = "产品小类")
     private String smallId;

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -124,7 +124,7 @@ public class AdminUserLogic {
 //            if (adminUser.getLoginErrNum() >= 3) {
 //                throw new RemoteServiceException("登陆失败，您已连续输入错误3次密码，请联系管理人员重置密码");
 //            }
-            if (adminUser.getLoginErrEndTime().getTime() >= DateUtil.date().getTime()) {
+            if (Objects.nonNull(adminUser.getLoginErrEndTime()) && adminUser.getLoginErrEndTime().getTime() >= DateUtil.date().getTime()) {
                 throw new RemoteServiceException("登陆失败，您已连续输入错误3次密码，请在" + DateUtil.formatDateTime(adminUser.getLoginErrEndTime()) + "后重试");
             }