Merge branch 'dev_tide' into dev_tide_cbsglxt

zouyu

3 天以前 4809db01709fd66fe3a25452ef41a6378b6ac6c8

 src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java

@@ -28,7 +28,7 @@
    @GetMapping("/listById")
    @ApiOperation("商品货架-查询")
    @Log(title = "商品货架-查询", businessType = BusinessType.OTHER)
    public AjaxResult listById(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
    public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
        List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
        return AjaxResult.success(list);
    }