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

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryNamesForm.java

@@ -14,7 +14,4 @@

    private Integer id;

    private Integer adminUserId;


}