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

cjl

2023-07-21 3b4574cf01b839bdac2ef5647a106185d709dd71

 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;