Merge branch 'zzx' into 2.0

src/views/operationManage/comboManage/checkoutCode.vue

@@ -179,8 +179,8 @@ export default {
     // },
     date(val) {
       if (val) {
-        this.query.startTime = val[0];
-        this.query.endTime = val[1];
+        this.query.startTime = Date.parse(val[0]);
+        this.query.endTime = Date.parse(val[1]);
       } else {
         this.query.startTime = "";
         this.query.endTime = "";