From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
index 49a37b1..1ca7f6b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
@@ -8,6 +8,9 @@
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.mdc.entity.MdcShiftSub;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 鐝琛�(娆¤〃)
  * @Author: Sake
@@ -33,10 +36,10 @@
 
     /**
      * 鏂板
-     * @param jsonbject
+     * @param mdcShiftSub
      * @return
      */
-    MdcShiftSub addMdcShiftSub(JSONObject jsonbject);
+    MdcShiftSub addMdcShiftSub(MdcShiftSub mdcShiftSub);
 
     /**
      * 淇敼
@@ -58,4 +61,11 @@
      * @return
      */
     Result deleteMdcShiftSub(String id);
+
+    /**
+     * 鏍规嵁鐝埗id鑾峰彇鐝涓嬫媺鍒楄〃
+     * @param shiftId
+     * @return
+     */
+    List<Map<String, String>> initShiftSubList(String shiftId);
 }

--
Gitblit v1.9.3