Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

 screen-manage/src/main/java/com/moral/api/pojo/form/login/LoginForm.java

@@ -13,7 +13,7 @@
 * @Version TODO
 **/
@Data
public class LoginForm implements Serializable {
public class LoginForm  {

    private String account;