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 | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 6c48d54..8dac067 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -24,6 +24,7 @@
informationNotification,
performanceShift,
auxiliaryWorkingHours,
+ unPass,
}
}
@@ -271,3 +272,6 @@
insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
}
+const unPass = {
+ pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+}
--
Gitblit v1.9.3