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

cjl

2023-09-26 36a11d78a2517b523fcf6b6ec622f3f0767f553f

 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;