From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 068184a..8dac067 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -23,7 +23,8 @@
sealScope,
informationNotification,
performanceShift,
- unPass,
+ auxiliaryWorkingHours,
+ unPass,
}
}
@@ -261,7 +262,14 @@
const performanceShift = {
add:"/performanceShift/add",//缁╂晥绠＄悊-鐝-鎺掔彮
page:"/performanceShift/page",//缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
- update:"/performanceShift/update/",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+ update:"/performanceShift/update",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+}
+
+const auxiliaryWorkingHours = {
+ selectAuxiliaryWorkingHours:"/auxiliaryWorkingHours/selectAuxiliaryWorkingHours",//鏌ヨ杈呭姪宸ユ椂
+ deleteAuxiliaryWorkingHours:"/auxiliaryWorkingHours/deleteAuxiliaryWorkingHours",//鍒犻櫎杈呭姪宸ユ椂
+ upAuxiliaryWorkingHours:"/auxiliaryWorkingHours/upAuxiliaryWorkingHours",//淇敼杈呭姪宸ユ椂
+ insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
}
const unPass = {
--
Gitblit v1.9.3