Merge remote-tracking branch 'origin/master'

cuilei

7 小时以前 8d0b466ef4fe497932e15c186688679e55a26f62

 src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java

@@ -191,4 +191,16 @@
       return Result.ok("操作成功！");
    }


    //@AutoLog(value = "线边仓库信息-通过id查询")
    @ApiOperation(value="线边仓库信息-通过id查询", notes="线边仓库信息-通过id查询")
    @GetMapping(value = "/queryByFactoryId")
    public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
       LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
       if(lineSideWarehouse==null) {
          return Result.error("未找到对应数据");
       }
       return Result.OK(lineSideWarehouse);
    }

}