14号第一次解决合并冲突

8120e1a2 · 裴文涛 · 9dece472 · 8120e1a2
Commit 8120e1a2 authored Aug 14, 2024 by 裴文涛
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

AnnualParamPage.vue src/views/SchedulingPage/AnnualParamPage.vue +0 -5

No files found.
--- a/src/views/SchedulingPage/AnnualParamPage.vue
+++ b/src/views/SchedulingPage/AnnualParamPage.vue
@@ -135,11 +135,6 @@ function onAddSubmit() { // 提交新增
      return
    }
  })
-<<<<<<< HEAD
-  console.log('>>>>>>>>==', addForm.value)
-  console.log('========>>>>', addForm.value.year)
-=======
->>>>>>> 9264ee33b707bc7814b1379ef943cba565c98072
  addAnnualParam(addForm.value).then(res => {
    if (res.success) {
      getData()