解决冲突

1bb1a26a · Your Name · 192e18ac · 0379c3d2 · 1bb1a26a
Commit 1bb1a26a authored May 26, 2021 by Your Name
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

index.vue src/page/STB/base/index.vue +0 -1

No files found.
--- a/src/page/STB/base/index.vue
+++ b/src/page/STB/base/index.vue
@@ -126,7 +126,6 @@ export default {
      let vm = this;
      let dates = {};
      if (this.form.date) {
-        // dates.startDate = this.form.date[0];
        dates.beginDate = this.form.date[0];
        dates.endDate = this.form.date[1];
      }