Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-07-31 2b5e23042827c66c936d6aeaa004f42b95236d52

 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;