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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

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

    private Integer id;

    private Integer adminUserId;


}