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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 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 (