diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue index 167de33f..7a69c959 100644 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ b/src/views/MarketingCenter/CreateProject/index.vue @@ -43,11 +43,11 @@ 新增 -<<<<<<< HEAD - -======= - ->>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7 + + + + + @@ -78,7 +78,7 @@