Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzDTO.java

@@ -20,12 +20,12 @@ public class FzxzDTO {
     private String ydxz_bsm;// 用地性质标识码
     private Float ydmjbegin;// 用地面积范围开始
     private Float ydmjend;// 用地面积范围结束
-    @TableField(value = "is_multiple")
-    private Boolean isMultiple;// 可多地块
-    @TableField(value = "multiple_length")
-    private Integer multipleLength;// 多地块最大距离
+    @TableField(value = "use_multiple")
+    private Boolean useMultiple;// 可多地块
+    @TableField(value = "multiple_distance")
+    private Integer multipleDistance;// 多地块最大距离
     @TableField(value = "use_land_type")
-    private Boolean useLandType;// 是否保持用地性质一致
+    private Boolean useLandType=false;// 是否保持用地性质一致
     private String zdpd;// 最大坡度
     private Double xzmj;// 选址面积(㎡)
     private String sjy;// 数据源,对应表的名称