From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1
---
admin/src/views/business/goodsorder.vue | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index e862a01..3319ed0 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -161,16 +161,11 @@
payStatus: '',
payWay: '',
payDate: '',
- type: '',
+ type: 0,
closeMoney: '',
startDate: '',
endDate: '',
-<<<<<<< HEAD
bikeType: ''
-=======
- type: 0
-
->>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
},
value1: [new Date(), new Date()]
}
--
Gitblit v1.9.3