From c7a5e18fa52ef6faf053e584a4ae9bb5bc55943b Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 22 一月 2024 08:19:31 +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 48cd9bc..897b358 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