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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

 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;