From 822201dc84ee71bc47a3a4cb76a4aa1f5d9e77f2 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期一, 22 一月 2024 18:39:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java index 7058b2c..745adeb 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java @@ -46,6 +46,15 @@ return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')") + @GetMapping("/list2") + public TableDataInfo list2(BsOrderScheduling bsOrderScheduling) + { +// startPage(); + List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); + return getDataTable(list); + } + /** * 瀵煎嚭璁㈠崟鎺掍骇鍒楄〃 */ -- Gitblit v1.9.3