Merge remote-tracking branch 'origin/master'

guoshilong

2023-11-03 f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d

 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java

@@ -32,6 +32,7 @@
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.wrapper.DoorplateAddressWrapper;
import org.springblade.modules.house.vo.HouseParam;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;

@@ -137,14 +138,12 @@

   /**
    * 获取楼盘相关集合数据
    * @param name 名称
    * @param code 编号
    * @param type 类型 1：社区  2：小区  3：楼栋  4：户室
    * @param houseParam
    * @return
    */
   @GetMapping("/getHousesList")
   public R getHousesList(String name,String code,Integer type,Integer addressType) {
      return R.data(doorplateAddressService.getHousesList(name,code,type,addressType));
   public R getHousesList(HouseParam houseParam) {
      return R.data(doorplateAddressService.getHousesList(houseParam));
   }

   /**
@@ -157,12 +156,16 @@
      return R.data(doorplateAddressService.getHouseRentInfo(code));
   }

   /**
    * 获取门牌地址树集合信息
    * @param code
    * @param type
    * @return
    */
   @GetMapping("/getDoorplateAddressList")
   public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
      List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
      return R.data(list);
   }



}