解决冲突

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java

@@ -88,7 +88,7 @@ public class StaffDetailV2FormDTO implements Serializable {
      * 居住地址
      */
     private String address;
-
+    /**
      * 文化程度，中文
      */
     private String cultureDisplay;