From dff879bf665bda24ee3de8af27c509dac17dd3ec Mon Sep 17 00:00:00 2001
From: yueminglinxia <1123_Wu813>
Date: Wed, 9 Jun 2021 17:58:54 +0800
Subject: [PATCH] merge

---
 .../air/housing/service/impl/HousingEstatesServiceImpl.java    | 3 ---
 .../java/com/air/land/controller/LandListedController.java     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java
index 7a1beb3..142b37a 100644
--- a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java
+++ b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java
@@ -1,7 +1,6 @@
 package com.air.housing.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.air.enums.BlocksOriginStatusEnum;
 import com.air.housing.dto.HousingDefine;
 import com.air.housing.entity.Blocks;
@@ -17,13 +16,11 @@ import com.air.housing.vo.HousingEstatesDetail;
 import com.air.housing.vo.HousingEstatesName;
 import com.air.land.entity.LandListed;
 import com.air.land.mapper.LandListedMapper;
-import com.air.land.service.LandListedService;
 import com.air.origin.entity.BlocksOrigin;
 import com.air.origin.entity.HousesOrigin;
 import com.air.origin.service.BlocksOriginService;
 import com.air.origin.service.HousesOriginService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cinderella.framework.common.core.exception.BusinessException;
diff --git a/air/src/main/java/com/air/land/controller/LandListedController.java b/air/src/main/java/com/air/land/controller/LandListedController.java
index 583b942..52eb7b9 100644
--- a/air/src/main/java/com/air/land/controller/LandListedController.java
+++ b/air/src/main/java/com/air/land/controller/LandListedController.java
@@ -96,7 +96,7 @@ public class LandListedController {
      */
     @ApiOperation(value = "保存已挂牌地块（新增，修改）", notes = "新增已挂牌地块（传id为修改，不传为新增）")
     @PostMapping
-    public R<Boolean> saveLandListed(@RequestBody @Validated LandListedVo landListedVo) {
+    public R<Boolean> saveLandListed(@RequestBody LandListedVo landListedVo) {
         LandListed landListed = new LandListed();
         BeanUtil.copyProperties(landListedVo, landListed);
         return R.ok(landListedService.saveOrUpdate(landListed), "保存成功");