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

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 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;