|
|
1a285481dc
|
Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
# application/admin/controller/aftersales/Aftersale.php
# application/admin/view/aftersales/aftersale/add.html
# public/assets/js/backend/order.js
|
2025-04-19 17:50:09 +08:00 |
|
|
|
12ab4135ca
|
调整
|
2025-04-19 17:44:32 +08:00 |
|
xman
|
b5c9f6e29b
|
审核
|
2025-04-18 17:25:28 +08:00 |
|
xman
|
d3d4f6c2e9
|
aftersale
|
2025-04-18 14:22:46 +08:00 |
|
|
|
1ac760222c
|
开票
|
2025-04-17 11:17:40 +08:00 |
|
|
|
a916c55786
|
开票
|
2025-04-16 17:51:41 +08:00 |
|
xman
|
b907583658
|
添加日志
|
2025-04-14 11:28:10 +08:00 |
|
xman
|
8424126ffd
|
sth
|
2025-04-12 19:54:05 +08:00 |
|
xman
|
ebc11c0513
|
sth
|
2025-04-12 19:32:15 +08:00 |
|
xman
|
d4521e4410
|
sth
|
2025-04-12 18:46:27 +08:00 |
|
|
|
6d9772e6c9
|
取消订单
|
2025-04-09 20:21:49 +08:00 |
|
zhuyu
|
cf1b76c0ab
|
Accept Merge Request #16: (feature/zy -> develop)
Merge Request: feature: task
Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/16?initial=true
|
2025-04-07 09:25:32 +08:00 |
|
xman
|
d037ec193d
|
record
|
2025-04-01 17:19:25 +08:00 |
|
xman
|
c5db908603
|
hook
|
2025-04-01 15:46:37 +08:00 |
|
xman
|
7a4bafcc12
|
dispatch 日志
|
2025-03-31 11:15:08 +08:00 |
|
zhuyu
|
7e535c03b0
|
feature: task
|
2025-03-30 17:59:00 +08:00 |
|
zhuyu
|
b5c32bb8ad
|
Merge branch 'develop' into feature/zy
|
2025-03-30 16:54:49 +08:00 |
|
xman
|
09e94cd7b3
|
配置订单
|
2025-03-29 21:40:16 +08:00 |
|
xman
|
d3d63f4872
|
修改派单
|
2025-03-29 20:54:18 +08:00 |
|
|
|
2b32306511
|
添加管理员区域配置
|
2025-03-29 19:05:22 +08:00 |
|
xman
|
66407c5adf
|
配置订单
|
2025-03-27 20:49:09 +08:00 |
|
xman
|
d8ae933e81
|
配置订单
|
2025-03-27 20:36:30 +08:00 |
|
xman
|
e445d84761
|
配置订单
|
2025-03-27 17:18:28 +08:00 |
|
xman
|
2e9bd0d804
|
cancel任务
|
2025-03-27 14:56:07 +08:00 |
|
xman
|
8c4ce33384
|
sth
|
2025-03-24 21:40:45 +08:00 |
|
zhuyu
|
d7462f828f
|
Merge branch 'develop' into feature/zy
|
2025-03-24 09:50:42 +08:00 |
|
zhuyu
|
a051e4136f
|
feature: task
|
2025-03-22 18:47:00 +08:00 |
|
zhuyu
|
30ecfd1f65
|
feature: task
|
2025-03-22 18:24:24 +08:00 |
|
zhuyu
|
f8b0af6057
|
feature: task
|
2025-03-21 17:56:26 +08:00 |
|
zhuyu
|
f3ee736f1c
|
feature: task
|
2025-03-21 17:55:41 +08:00 |
|
xman
|
71d5546148
|
sth
|
2025-03-20 21:39:38 +08:00 |
|
|
|
bf4d2cf9ee
|
派单
|
2025-03-14 18:22:34 +08:00 |
|
|
|
3e780bf5c6
|
添加地区筛选
|
2025-03-10 23:07:20 +08:00 |
|
zhuyu
|
bf23a69626
|
feature: task
|
2025-03-10 22:04:09 +08:00 |
|
|
|
d028613923
|
Accept Merge Request #10: (feature/hant -> develop)
Merge Request: 工人录入
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/10?initial=true
|
2025-03-10 20:31:59 +08:00 |
|
|
|
9b04e4d9a0
|
工人录入
|
2025-03-10 20:30:39 +08:00 |
|
xman
|
a6114e498b
|
Merge branch 'feature/xman' into develop
|
2025-03-10 15:55:44 +08:00 |
|
xman
|
e5df57d162
|
sth
|
2025-03-10 15:55:20 +08:00 |
|
|
|
738f3973d6
|
Accept Merge Request #8: (feature/hant -> develop)
Merge Request: 黑明单管理
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/8
|
2025-03-10 15:28:44 +08:00 |
|
|
|
bf13e11900
|
Merge remote-tracking branch 'origin/feature/hant' into feature/hant
|
2025-03-10 15:27:18 +08:00 |
|
xman
|
0728974358
|
sth
|
2025-03-10 15:08:57 +08:00 |
|
xman
|
59420b045b
|
sth
|
2025-03-10 14:39:43 +08:00 |
|
xman
|
c296c743db
|
sth
|
2025-03-10 13:58:04 +08:00 |
|
xman
|
54d79c0197
|
sth
|
2025-03-10 13:57:39 +08:00 |
|
xman
|
eb7e22ca40
|
sth
|
2025-03-10 11:49:38 +08:00 |
|
xman
|
1729d3cf8b
|
sth
|
2025-03-10 11:28:47 +08:00 |
|
xman
|
311e6f8b86
|
sth
|
2025-03-10 10:43:04 +08:00 |
|
xman
|
141362cc51
|
sth
|
2025-03-10 10:41:43 +08:00 |
|
|
|
650d78b73a
|
黑明单管理
|
2025-03-09 21:40:36 +08:00 |
|
|
|
328d08e1d8
|
订单录入
|
2025-03-08 16:39:37 +08:00 |
|
