From 93c42cfcfe12125c463563f191d6ade421ba9db5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 15:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/bikeRetakeRecord.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index 0706ce2..bcee59b 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -116,7 +116,7 @@
searchForm: {
id: '',
createDate: '',
- creator: '',
+ hasBack: '',
editDate: '',
editor: '',
isdeleted: '',
@@ -165,6 +165,7 @@
'field.main': 'id'
})
this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ this.searchForm.endDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 23:59:59'
this.search()
},
methods: {
--
Gitblit v1.9.3