From 5b1b663f77cb59599302a93fb6cb2da208602c34 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 三月 2025 14:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' 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