From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
similarity index 64%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
index 4f60a54..7bab60f 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
 
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
@@ -13,15 +13,15 @@
  * @Version TODO
  **/
 @Data
-public class LoginRequest implements Serializable {
+public class LoginForm implements Serializable {
 
     private String account;
 
     private String password;
 
     public boolean valid(){
-        if(ObjectUtils.isEmpty(account)||ObjectUtils.isEmpty(password))
-            return false;
+            if(ObjectUtils.isEmpty(account)||ObjectUtils.isEmpty(password))
+                return false;
         return true;
     }
 }

--
Gitblit v1.8.0