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

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 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;