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

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

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

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

    private Integer id;

    private Integer adminUserId;


}