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

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

 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;