解决冲突

7405210f · caoyanzhi · c2b645bf · 7405210f
Commit 7405210f authored Apr 17, 2019 by caoyanzhi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

member-tag.vue src/view/platformTag/member-tag.vue +0 -4

No files found.
--- a/src/view/platformTag/member-tag.vue
+++ b/src/view/platformTag/member-tag.vue
@@ -69,11 +69,7 @@
            </div>
            <div class="form-item">
              <label for="">分组有效期</label>
-<<<<<<< HEAD
-              <el-date-picker v-model="tagConfig.date" type="date" placeholder="选择日期"></el-date-picker>
-=======
              <el-date-picker v-model="tagConfig.date" value-format="yyyy-MM-dd HH:MM:SS" type="date" placeholder="选择日期"> </el-date-picker>
->>>>>>> dev
            </div>
            <div class="form-item">
              <label for="">分组描述</label>