Merge branch '0601Action' into test

src/views/couponManager/couponUpdate.vue

@@ -340,8 +340,8 @@ export default {
                   ...getTimes(effectiveTime, [
                     "effectiveStartTime",
                     "effectiveExpireTime",
-                  ]),
-                  ...getTimes(getTime, ["startDate", "endDate"]),
+                  ],'YYYY-MM-DD HH:mm:ss'),
+                  ...getTimes(getTime, ["startDate", "endDate"],'YYYY-MM-DD HH:mm:ss'),
                 };
                 const res = await addSysCoupon(params);
                 this.$message.success("新增成功");
@@ -370,8 +370,8 @@ export default {
                   ...getTimes(effectiveTime, [
                     "effectiveStartTime",
                     "effectiveExpireTime",
-                  ]),
-                  ...getTimes(getTime, ["startDate", "endDate"]),
+                  ],'YYYY-MM-DD HH:mm:ss'),
+                  ...getTimes(getTime, ["startDate", "endDate"],'YYYY-MM-DD HH:mm:ss'),
                 };
                 const res = await resetSysCoupon(params);
                 this.$message.success("新增成功");