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

lizijie

2021-05-28 43e5052b91f0568ccbcf3fd6df70cf8209db184a

 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;