合并

src/views/design/appointment/index.vue

@@ -510,10 +510,6 @@ const submitForm = async () => {
   try {
     // 1. 基础表单验证
     await leaveFormRef.value.validate();
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/ljj
     // 2. 提交前二次校验：「专业+人员」组合唯一性
     let hasDuplicate = false;
     const allKeys: string[] = [];
@@ -571,10 +567,6 @@ const submitForm = async () => {
         )
       ]
     };
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/ljj
     // 4. 数据处理（保持原有逻辑不变）
     const arr = [];
     userList.value.forEach((item) => {