Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

昨天 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

 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);
    }