Commit Graph

449 Commits

Author SHA1 Message Date
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
6dc5156074 订单录入bug 2025-06-07 19:22:07 +08:00
021225c57f 订单录入bug 2025-06-07 19:04:44 +08:00
xman
fbae7efd98 通知 2025-06-06 19:57:56 +08:00
7536a6d7cc Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/admin/controller/AutoDispatchLogic.php
#	application/common/Logic/OrderLogic.php
2025-06-05 22:14:46 +08:00
89168202b2 处理错误 2025-06-05 22:12:24 +08:00
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
xman
4d8e3f6986 通知 2025-06-05 21:53:08 +08:00
xman
c0a7b7d7e8 通知 2025-06-05 21:33:40 +08:00
bdc0ff111e Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-05 20:23:29 +08:00
2a068d2ee6 修改 2025-06-05 18:05:12 +08:00
zhuyu
3690076503 Accept Merge Request #115: (feature/zy -> develop)
Merge Request: feature: 复制

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/115
2025-06-05 15:54:40 +08:00
zhuyu
65fe19b15a feature: 复制 2025-06-05 15:53:36 +08:00
zhuyu
69ebde0732 feature: 任务复制 2025-06-05 15:16:09 +08:00
c02fff7530 修改 2025-06-05 10:31:37 +08:00
7da4aeb708 修改 2025-06-04 14:21:00 +08:00
zhuyu
716a84303c Accept Merge Request #105: (feature/zy -> develop)
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/105
2025-06-04 09:30:06 +08:00
zhuyu
a339bdf316 feature: auth 2025-06-04 09:29:26 +08:00
zhuyu
58f6fee9ad Accept Merge Request #104: (feature/zy -> develop)
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/104
2025-06-04 09:21:41 +08:00
zhuyu
4ead5dab34 feature: auth 2025-06-04 09:21:04 +08:00
zhuyu
5d71637a0d Accept Merge Request #103: (feature/zy -> develop)
Merge Request: feature: salary menu

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/103
2025-06-03 23:32:26 +08:00
zhuyu
673751c5bd feature: salary menu 2025-06-03 23:29:10 +08:00
zhuyu
663c4317ef Accept Merge Request #102: (feature/zy -> develop)
Merge Request: feature: salary menu

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/102
2025-06-03 23:22:36 +08:00
zhuyu
b456b03c06 feature: salary menu 2025-06-03 23:21:49 +08:00
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
xman
1e13c81f16 通知 2025-06-02 20:45:29 +08:00
xman
433f3bbce4 通知 2025-06-02 20:25:31 +08:00
5f8a2feac1 Accept Merge Request #96: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/96?initial=true
2025-06-02 19:03:54 +08:00
b96fc31bc6 修改 2025-06-02 19:03:16 +08:00
xman
c5cd79edd5 上门前提醒 2025-06-02 18:37:32 +08:00
xman
c1ac4bf315 sth 2025-06-02 15:19:53 +08:00
xman
5a6642ea1f 完成订单重构 2025-06-02 13:55:57 +08:00
xman
7a6bc2940a 完成订单重构 2025-06-02 12:59:30 +08:00
xman
9c32d4ba72 完成订单重构 2025-06-02 12:59:07 +08:00
zhuyu
a31f337a65 feature: task notice 2025-06-02 12:15:32 +08:00
zhuyu
fbdc9c8aba feature: task notice 2025-06-02 12:11:31 +08:00
zhuyu
b8313ec13a feature: task notice 2025-06-02 12:08:46 +08:00
zhuyu
3c1221db58 feature: taskk 2025-06-02 11:53:21 +08:00
zhuyu
ca93a9e071 Accept Merge Request #91: (feature/zy -> develop)
Merge Request: feature: taskk

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/91?initial=true
2025-06-02 11:18:14 +08:00
zhuyu
059cee2313 feature: taskk 2025-06-02 11:17:51 +08:00
xman
0360e5c29a Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-06-01 22:49:55 +08:00
xman
dc2a71949e 完成订单重构 2025-06-01 22:41:54 +08:00
03c72b86ad Accept Merge Request #90: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/90?initial=true
2025-06-01 22:36:38 +08:00
2ab964b734 修改 2025-06-01 22:35:42 +08:00
xman
d5050f0dd0 完成订单重构 2025-06-01 22:28:02 +08:00
xman
7e1abeb449 完成订单重构 2025-06-01 17:32:26 +08:00
xman
51d72bc25d 完成订单重构 2025-06-01 17:30:48 +08:00
xman
d19845a072 完成订单重构 2025-06-01 17:27:19 +08:00