Commit Graph

743 Commits

Author SHA1 Message Date
xman
bceea13d7e Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:52:56 +08:00
xman
f7a32b9321 sth 2025-06-20 16:52:35 +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
xman
10cff56e96 Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:14:27 +08:00
xman
f776e55756 sth 2025-06-20 16:14:03 +08:00
zhuyu
0cdfb5576b Accept Merge Request #162: (feature/zy -> develop)
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/162?initial=true
2025-06-20 16:06:03 +08:00
zhuyu
344466f013 feature: 权限 2025-06-20 16:04:52 +08:00
xman
f85c2988ca Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 15:48:32 +08:00
xman
9953cbcfac sth 2025-06-20 15:48:11 +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
91f3266094 sth 2025-06-19 16:23:39 +08:00
xman
bc9aa3fb57 sth 2025-06-19 15:20:46 +08:00
xman
c5327ad8d2 sth 2025-06-19 15:06:40 +08:00
xman
212c306a65 sth 2025-06-19 14:59:33 +08:00
xman
d73e008d58 sth 2025-06-19 14:57:51 +08:00
xman
18b1dab8e4 Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-06-19 09:35:29 +08:00
xman
8c42814d5e sth 2025-06-19 09:35:18 +08:00
gcd
0e37fbb783 feat: 【后台管理】订单数据看板页面微调。 2025-06-18 23:20:42 +08:00
b3ba64a651 添加消息 2025-06-18 16:49:05 +08:00
xman
56049e89be sth 2025-06-18 14:52:45 +08:00
xman
51a42a9b25 sth 2025-06-18 12:00:10 +08:00
xman
455ba5e744 Merge remote-tracking branch 'origin/develop' into develop 2025-06-18 11:22:10 +08:00
xman
70b1ff8ce7 sth 2025-06-18 11:21:48 +08:00
4f703b57a7 Accept Merge Request #155: (feature/hant -> develop)
Merge Request: 派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/155?initial=true
2025-06-18 11:15:46 +08:00
cf2fa22190 派单 2025-06-18 11:14:55 +08:00
af251b9d37 Accept Merge Request #154: (feature/hant -> develop)
Merge Request: 地图派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/154?initial=true
2025-06-18 10:16:24 +08:00
0103120071 地图派单 2025-06-18 10:14:29 +08:00
xman
c1d6259bc9 sth 2025-06-18 10:08:42 +08:00
d9b6788c22 订单问题 2025-06-18 09:39:43 +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
xman
4c7101ab80 sth 2025-06-17 15:34:28 +08:00
xman
6b4af27857 sth 2025-06-17 15:23:00 +08:00
xman
d0efa47ab3 sth 2025-06-17 15:22:26 +08:00
xman
ace5bd7f36 sth 2025-06-17 15:04:33 +08:00
xman
713895c9c3 sth 2025-06-17 13:44:32 +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
18e48f793b 地址 2025-06-16 22:20:40 +08:00
xman
5b4c2994c9 地址 2025-06-16 21:56:43 +08:00
xman
797c093b63 地址 2025-06-16 21:44:05 +08:00
xman
e5f0572c3f 地址 2025-06-16 21:39:47 +08:00
xman
e24f5f0449 地址 2025-06-16 21:23:52 +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