Merge branch 'test'

Merge branch 'dev' into test
feat(custom):
2024-08-05 05:33:50 +08:00 · 2024-08-05 05:33:39 +08:00 · 2024-08-05 05:33:20 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/views/order/pending_list/index.vue
+++ b/src/views/order/pending_list/index.vue
@@ -148,7 +148,7 @@ const columns = ref([
  {
    title: '订单号',
    align: 'center',
-    key: 'oid',
+    key: 'jl_oid',
    width: 150,
    fixed: 'left',
  },
Author	SHA1	Message	Date
Huakk	7dda1e1734	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-05 05:33:50 +08:00
Huakk	a8a3bc4ee9	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-05 05:33:39 +08:00
Huakk	825a4ae3ea	feat(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-05 05:33:20 +08:00