Commit Graph

121 Commits

Author SHA1 Message Date
xman
5a6642ea1f 完成订单重构 2025-06-02 13:55:57 +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
1db3b3c9fd 完成订单重构 2025-06-01 23:18:37 +08:00
xman
12fd8dd404 完成订单重构 2025-06-01 16:22:35 +08:00
995d06ea1d 修改 2025-05-31 17:48:26 +08:00
zhuyu
53a2ac0ee9 Accept Merge Request #80: (feature/zy -> develop)
Merge Request: feature: 工资管理类型

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/80
2025-05-29 15:56:10 +08:00
zhuyu
a988d4d54b feature: 工资管理类型 2025-05-29 15:54:00 +08:00
aab0299d15 修改 2025-05-28 23:47:46 +08:00
zhuyu
10fcccf53a feature: 面板 2025-05-28 17:30:03 +08:00
zhuyu
f26559be6c Accept Merge Request #75: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/75?initial=true
2025-05-28 10:59:32 +08:00
zhuyu
74ad433809 feature: 面板 2025-05-28 10:52:13 +08:00
cc6e507f0e Accept Merge Request #73: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/73?initial=true
2025-05-27 23:55:22 +08:00
353fd4c3eb 退款数据 2025-05-27 23:54:30 +08:00
zhuyu
35ac2312c8 Accept Merge Request #60: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/60?initial=true
2025-05-23 17:55:47 +08:00
zhuyu
fef82b5a66 feature: 面板 2025-05-23 17:48:10 +08:00
zhuyu
8e87f97bea Accept Merge Request #58: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/58?initial=true
2025-05-23 15:34:22 +08:00
zhuyu
01ff921514 feature: 面板 2025-05-23 15:09:32 +08:00
zhuyu
531edc68c3 Accept Merge Request #57: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/57
2025-05-22 18:01:21 +08:00
zhuyu
73700581bf feature: 面板 2025-05-22 17:55:28 +08:00
xman
d8a8bcfb71 sth 2025-05-20 21:50:50 +08:00
xman
c3ef078c36 sth 2025-05-19 21:36:57 +08:00
xman
d8546c9d74 sth 2025-05-18 19:51:29 +08:00
1d9f305078 Accept Merge Request #54: (feature/hant -> develop)
Merge Request: 售前绩效

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/54?initial=true
2025-05-18 19:40:06 +08:00
a314f791e7 售前绩效 2025-05-18 19:39:39 +08:00
xman
056e984503 Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-05-18 19:28:47 +08:00
xman
93a2415ac4 sth 2025-05-18 19:28:32 +08:00
1cf64baf95 运营补单 2025-05-18 18:41:05 +08:00
zhuyu
fe2fc2efa8 feature: kpi item template 2025-05-16 16:12:02 +08:00
zhuyu
eb531334f6 feature: kpi item template 2025-05-15 17:20:46 +08:00
zhuyu
8552683047 feature: kpi template 2025-05-15 16:54:50 +08:00
zhuyu
24466054c7 feature: kpi template 2025-05-15 16:35:19 +08:00
zhuyu
fb50c71232 feature: kpi template 2025-05-14 10:49:14 +08:00
zhuyu
a087a9d4c8 feature: kpi template 2025-05-14 10:41:39 +08:00
zhuyu
0801237869 feature: kpi 2025-05-13 17:15:29 +08:00
zhuyu
2d3a85ca8c feature: schedule 2025-05-11 21:57:03 +08:00
zhuyu
45f3edc5cb Merge branch 'develop' into feature/zy 2025-05-11 17:55:37 +08:00
zhuyu
f131a658b7 feature: task 2025-05-11 17:44:49 +08:00
5d1b4f3d1e 面板 2025-05-10 18:45:18 +08:00
xman
e947683638 sth 2025-04-29 14:30:47 +08:00
xman
d4aea44afc sth 2025-04-28 16:50:53 +08:00
xman
3fb6925a8f sth 2025-04-28 16:37:32 +08:00
xman
490e1232f0 统计 2025-04-22 18:13:43 +08:00
xman
8f45a42d84 sth 2025-04-22 16:03:32 +08:00
xman
3c829efb54 sth 2025-04-22 13:49:15 +08:00
xman
d7046959aa sth 2025-04-21 11:59:42 +08:00
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