coding

7b89a8da · 杨柠瑞 · 1f57e8b1 · 7b89a8da
Commit 7b89a8da authored Apr 20, 2018 by 杨柠瑞
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

HmComplexTable.vue src/views/haomo/components/tables/HmComplexTable.vue +0 -5

No files found.
--- a/src/views/haomo/components/tables/HmComplexTable.vue
+++ b/src/views/haomo/components/tables/HmComplexTable.vue
@@ -137,11 +137,6 @@

    <!-- 弹窗 -->
    <!-- @TODO 补充详情弹窗 -->
-<<<<<<< HEAD
-    
-=======
-
->>>>>>> b14b9dd1366e279bb016eabe5d84271fe8fbc513
    <el-dialog :title="dialogName" :visible.sync="dialogFormVisible" :close-on-click-modal="closeOnClickModal" width="45%" v-if="dialogFormVisible">
      <hm-complex-form :schema="HmComplexForm.formSchema"
                       :columns="HmComplexForm.showUserColumns"