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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

@@ -36,10 +36,6 @@

    private Integer areaCode;

    private Long townCode;

    private Long villageCode;

    private String phone;

    private String email;