From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

---
 src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue b/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
index 5083c09..56aa234 100644
--- a/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
@@ -448,6 +448,7 @@
             userInfos.value.projectId = value;
             await initBackEndControlRoutes();
         };
+
         return {
             addRef,
             addRules,

--
Gitblit v1.9.2