bug修改

4 years ago · 3dd529c741
1 changed files with 1 additions and 4 deletions
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@ -99,11 +99,8 @@
                     size="small"
                     type="red">导入</el-button>

-<<<<<<< HEAD
-        </el-upload>
-=======
+
        </el-upload> -->
-        >>>>>>> dev-shuju

      </div>