|
|
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 |
|
xman
|
761ba043c2
|
完成订单重构
|
2025-06-01 16:29:36 +08:00 |
|
xman
|
12fd8dd404
|
完成订单重构
|
2025-06-01 16:22:35 +08:00 |
|
xman
|
37a39dbe5d
|
完成订单重构
|
2025-06-01 15:46:01 +08:00 |
|
xman
|
6d69f99d5a
|
跟进重构
|
2025-06-01 14:33:53 +08:00 |
|
xman
|
ea2901e902
|
跟进重构
|
2025-06-01 14:08:21 +08:00 |
|
xman
|
48de1eb9ea
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-05-31 18:08:05 +08:00 |
|
