Commit Graph

403 Commits

Author SHA1 Message Date
a54769e075 修改 2025-06-23 10:31:49 +08:00
e4ce0feef3 Accept Merge Request #168: (feature/hant -> develop)
Merge Request: 退单统计

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/168?initial=true
2025-06-22 18:42:28 +08:00
02dbc1233a 退单统计 2025-06-22 18:41:46 +08:00
xman
b4fe76cb3c sth 2025-06-22 18:29:19 +08:00
xman
e74a3ff6e0 sth 2025-06-22 18:25:14 +08:00
xman
4e5a75c220 sth 2025-06-21 13:14:38 +08:00
xman
ba3d3845fc sth 2025-06-21 13:12:09 +08:00
xman
b3fa4e55c0 sth 2025-06-21 12:58:28 +08:00
xman
2385ba80a9 sth 2025-06-21 12:58:03 +08:00
xman
6bb57747d3 sth 2025-06-21 12:53:13 +08:00
xman
f808204a4a sth 2025-06-21 12:48:43 +08:00
cd4a63e381 Accept Merge Request #163: (feature/hant -> develop)
Merge Request: 添加搜索以及退款信息

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/163?initial=true
2025-06-20 16:49:36 +08:00
7fa8e964c9 添加搜索以及退款信息 2025-06-20 16:48:41 +08:00
zhuyu
1cff9a4edf Accept Merge Request #161: (feature/zy -> develop)
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/161
2025-06-20 16:00:56 +08:00
zhuyu
8db6b11d46 feature: 权限 2025-06-20 15:59:50 +08:00
zhuyu
4903a315b9 feature: 权限 2025-06-20 15:59:02 +08:00
zhuyu
873f4896fb Accept Merge Request #160: (feature/zy -> develop)
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/160
2025-06-20 15:38:06 +08:00
zhuyu
6acfd4b6e4 feature: 权限 2025-06-20 15:37:07 +08:00
xman
81a499ebfe sth 2025-06-19 15:21:40 +08:00
xman
a5939aff5d sth 2025-06-19 15:17:49 +08:00
xman
62d4d42cc9 sth 2025-06-18 16:33:00 +08:00
xman
f5bb64ce20 sth 2025-06-18 14:50:53 +08:00
xman
a6703edc0a sth 2025-06-18 14:47:26 +08:00
xman
c88e7ecac5 sth 2025-06-18 14:45:18 +08:00
xman
fba4b3c058 sth 2025-06-18 14:38:07 +08:00
xman
51a42a9b25 sth 2025-06-18 12:00:10 +08:00
xman
4f64d21044 sth 2025-06-18 11:24:55 +08:00
xman
70b1ff8ce7 sth 2025-06-18 11:21:48 +08:00
e21d9d615c 地区搜索 2025-06-17 23:07:17 +08:00
3d46ec1ee0 问题修复 2025-06-17 21:50:04 +08:00
4b1ade55b8 取消订单问题 2025-06-17 17:11:28 +08:00
a00c55b8ee Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-16 23:12:12 +08:00
f78d784441 问题修复 2025-06-16 23:12:01 +08:00
xman
5ec9f4b04a 地址 2025-06-16 22:29:17 +08:00
xman
18e48f793b 地址 2025-06-16 22:20:40 +08:00
xman
a070703342 地址 2025-06-16 22:01:49 +08:00
xman
a02eaeb3a8 地址 2025-06-16 21:21:46 +08:00
808c8801d3 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/admin/controller/orders/Dispatch2.php
2025-06-16 20:59:45 +08:00
xman
802a14cda5 地址 2025-06-16 18:16:10 +08:00
xman
e9e5ad25a0 三级筛选 2025-06-16 17:58:33 +08:00
xman
e3bab20f7b 三级筛选 2025-06-16 17:44:03 +08:00
xman
0718b4626c 三级筛选 2025-06-16 17:39:14 +08:00
xman
dba8e571fc 三级筛选 2025-06-16 17:34:18 +08:00
xman
aff4782cea 三级筛选 2025-06-16 17:28:03 +08:00
xman
984bceaebb sb 2025-06-16 16:20:41 +08:00
xman
2d871656ac sb 2025-06-16 14:43:25 +08:00
xman
bcef5370b8 sb 2025-06-16 13:49:35 +08:00
xman
25a38ed146 sb 2025-06-16 13:44:20 +08:00
d0938fc804 问题修复 2025-06-15 18:34:41 +08:00
19ab64c109 智能识别 2025-06-14 18:03:47 +08:00