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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

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

    private Integer id;

    private Integer adminUserId;


}