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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java

@@ -112,5 +112,13 @@ public class IcHouseAddFormDTO implements Serializable {
      * 房屋可编辑编码
      */
     private String coding;
+    /**
+     * 所在楼层
+     */
+    private String floor;
+    /**
+     * 面积
+     */
+    private String area;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -136,4 +136,12 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	 * 房屋可编辑编码
 	 */
 	private String coding;
+	/**
+	 * 所在楼层
+	 */
+	private String floor;
+	/**
+	 * 面积
+	 */
+	private String area;
 }