BUG 修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

@@ -41,5 +41,7 @@ public class BaseDto implements Serializable{
 	
 	@ExcelIgnore
 	@ApiModelProperty(value = "是否删除")
-    private Boolean isDelete;
+    private Boolean isDelete=false;
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -35,5 +35,6 @@ public class BaseEntity implements Serializable{
 	 * 是否删除
 	 */
 	@TableField(value = "is_delete")
-	private Boolean isDelete;
+	public Boolean isDelete=false;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResource.java

@@ -205,4 +205,6 @@ public class WaterResource extends BaseEntity {
 	@ApiModelProperty("维保周期")
 	@TableField("maintenance_period")
 	private String maintenancePeriod;
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -94,6 +94,7 @@ public class WaterResourceController extends BaseController {
         model.setResourceTypeName(resourceTypeEnum.get().getName());
         model.setRealityImg(null);
         model.setOrientationImg(null);
+        model.setIsDelete(true);
         /*2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 97-102行*/
        /* if(model.getAddress()!=null){
             JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());