Commit Graph

504 Commits

Author SHA1 Message Date
9d66a75218 修改 2025-06-30 18:03:41 +08:00
xman
75007bd2d7 sth 2025-06-28 23:14:08 +08:00
xman
a95d38be92 sth 2025-06-28 20:12:22 +08:00
xman
6822970140 sth 2025-06-28 19:27:22 +08:00
xman
3166b73988 sth 2025-06-28 19:24:50 +08:00
ad20e45ffa 修改 2025-06-27 18:06:27 +08:00
403ff850e8 Merge remote-tracking branch 'origin/develop' into develop 2025-06-27 16:02:57 +08:00
4c14780e82 修改 2025-06-27 16:02:47 +08:00
xman
6a32e262b5 sth 2025-06-27 11:26:03 +08:00
zhuyu
865aa90dcb Accept Merge Request #192: (feature/zy -> develop)
Merge Request: feature: 排班优化

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/192
2025-06-27 10:34:33 +08:00
zhuyu
499177247b feature: 排班优化 2025-06-27 10:33:49 +08:00
zhuyu
42b8d8db93 Accept Merge Request #191: (feature/zy -> develop)
Merge Request: feature: 排班优化

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/191
2025-06-27 10:19:33 +08:00
zhuyu
881ae3d485 feature: 排班优化 2025-06-27 10:17:46 +08:00
zhuyu
a3980076f0 Accept Merge Request #190: (feature/zy -> develop)
Merge Request: feature: 排班优化

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/190
2025-06-27 10:04:37 +08:00
zhuyu
8d7aceaf70 feature: 排班优化 2025-06-27 10:03:01 +08:00
zhuyu
6400ab5515 Accept Merge Request #186: (feature/zy -> develop)
Merge Request: feature: 排班

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/186
2025-06-26 14:59:58 +08:00
zhuyu
962177d12e feature: 添加排班 2025-06-26 14:53:24 +08:00
8b3c98980c Accept Merge Request #184: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/184?initial=true
2025-06-26 14:28:00 +08:00
e9dce2407d 修改 2025-06-26 14:27:15 +08:00
c4757bffe4 Accept Merge Request #182: (feature/hant -> develop)
Merge Request: 关闭双击事件

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/182?initial=true
2025-06-25 13:58:16 +08:00
be6a50b7df 关闭双击事件 2025-06-25 13:57:24 +08:00
30658e9bb6 Accept Merge Request #181: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/181?initial=true
2025-06-25 11:48:56 +08:00
7dd30af6ad 修改 2025-06-25 11:47:43 +08:00
zhuyu
81bc56f571 feature: 组筛选 2025-06-24 17:59:12 +08:00
b3aaff2238 Accept Merge Request #178: (feature/hant -> develop)
Merge Request: 取消订单日志

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/178?initial=true
2025-06-24 15:07:58 +08:00
c39e3c01da 取消订单日志 2025-06-24 14:53:07 +08:00
xman
f5f1ae1a46 sth 2025-06-23 14:54:54 +08:00
99782e9764 修改 2025-06-23 14:51:56 +08:00
3f12333026 修改 2025-06-23 14:27:19 +08:00
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
aa4402057a sth 2025-06-21 13:08:18 +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
2d8186e6ff 新打包 2025-06-20 17:52:25 +08:00
xman
51c9d72325 sth 2025-06-20 17:36:12 +08:00
xman
73c7008e3b sth 2025-06-20 17:30:59 +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
e5ffa674b0 录入订单 2025-06-14 15:00:27 +08:00
cc3ff1e900 鞭策牛马 2025-06-12 17:12:37 +08:00
65d22c70da 订单优化 2025-06-11 20:00:27 +08:00
3d57e6cce1 订单优化 2025-06-11 18:22:38 +08:00
2e1ce5cb57 订单优化 2025-06-11 17:47:30 +08:00
90c3c4ba25 订单优化 2025-06-11 17:14:31 +08:00
66c9dcdc7d 自动识别 2025-06-10 23:38:38 +08:00
3b5e2a8a29 订单优化 2025-06-10 16:42:30 +08:00
3edb2386a9 订单优化 2025-06-10 16:15:40 +08:00
be4df03f64 搜索 2025-06-10 15:54:36 +08:00
846a9eb809 燕国地图修改 2025-06-10 14:06:49 +08:00
726c14bae0 优化 2025-06-09 23:16:58 +08:00
gcd
59303bac7a feat: 后台复制订单页面调整 2025-06-08 23:31:39 +08:00
gcd
2785532d4f feat: 后台复制订单页面调整 2025-06-08 23:02:15 +08:00
gcd
4c32627276 feat: 后台修改订单页面调整 2025-06-08 22:44:05 +08:00
gcd
cb6c595c8f feat: 后台订单录入页面调整 2025-06-08 21:12:46 +08:00
gcd
463240df80 feat: 后台订单录入页面调整 2025-06-08 18:16:11 +08:00