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

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

 screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java

@@ -39,7 +39,7 @@

    private String wechat;

    private List<String> roleIds;
    private List<Integer> roleIds;

    public boolean valid() {
        if (