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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 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;