From 50d3e8a733b091063aa3cf96aeddc3e13c4a745a Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 22 一月 2024 16:22:27 +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..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
@@ -41,6 +41,15 @@
@GetMapping("/list")
public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
{
+ startPage();
+ List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ 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