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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java

@@ -27,6 +27,8 @@

    private String userName;

    private String account;

    private String email;

    private String mobile;