Commit Graph

772 Commits

Author SHA1 Message Date
37aa209c0c Accept Merge Request #125: (feature/hant -> develop)
Merge Request: 关闭等待

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/125?initial=true
2025-06-08 14:55:04 +08:00
897d5114fc 关闭等待 2025-06-08 14:54:11 +08:00
cb2532f611 Accept Merge Request #124: (feature/hant -> develop)
Merge Request: 开启短信

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/124?initial=true
2025-06-08 12:12:52 +08:00
b3cfe3ec65 开启短信 2025-06-08 12:11:47 +08:00
xman
226b12cf82 通知 2025-06-08 12:01:39 +08:00
xman
d749d99b63 通知 2025-06-08 12:00:54 +08:00
xman
f87648c09b 通知 2025-06-08 11:54:14 +08:00
大狗哥
cd49b5dab3 Accept Merge Request #123: (feature/dgg -> develop)
Merge Request: feat: 修复项目报错

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/123
2025-06-07 21:47:26 +08:00
gcd
e19188b046 feat: 修复项目报错 2025-06-07 21:47:03 +08:00
34168fd7c0 Accept Merge Request #122: (feature/hant -> develop)
Merge Request: 订单状态修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/122?initial=true
2025-06-07 19:40:27 +08:00
0588b2191b 订单状态修改 2025-06-07 19:39:59 +08:00
f94ff3d3c3 Accept Merge Request #121: (feature/hant -> develop)
Merge Request: 订单录入bug

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/121?initial=true
2025-06-07 19:22:26 +08:00
6dc5156074 订单录入bug 2025-06-07 19:22:07 +08:00
fefb300be4 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-07 19:10:31 +08:00
4783374605 Accept Merge Request #120: (feature/hant -> develop)
Merge Request: 定时任务

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/120?initial=true
2025-06-07 19:05:28 +08:00
021225c57f 订单录入bug 2025-06-07 19:04:44 +08:00
xman
9e4411532c 通知 2025-06-07 17:55:32 +08:00
xman
bf5a52b454 通知 2025-06-06 20:30:32 +08:00
xman
8fe7bacbac 通知 2025-06-06 20:23:05 +08:00
xman
fbae7efd98 通知 2025-06-06 19:57:56 +08:00
31eeef9c19 定时任务 2025-06-06 17:52:37 +08:00
6885fbbcf4 Accept Merge Request #119: (feature/hant -> develop)
Merge Request: 定时任务

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/119?initial=true
2025-06-06 17:34:34 +08:00
e208f874c7 定时任务 2025-06-06 17:33:51 +08:00
xman
495c0e3f33 通知 2025-06-06 16:47:15 +08:00
xman
c9944b8b07 通知 2025-06-06 15:57:33 +08:00
xman
631cd00d17 通知 2025-06-06 15:57:18 +08:00
xman
696919950d 通知 2025-06-06 15:49:46 +08:00
zhuyu
6045d93716 Accept Merge Request #118: (feature/zy -> develop)
Merge Request: feature: kpi dash

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/118
2025-06-05 23:29:59 +08:00
zhuyu
aa2bbdee0c feature: kpi dash 2025-06-05 23:26:21 +08:00
xman
31a9a3ce0a 通知 2025-06-05 22:30:56 +08:00
21c044789f Accept Merge Request #117: (feature/hant -> develop)
Merge Request: 处理错误

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/117?initial=true
2025-06-05 22:18:02 +08:00
5c613b9cee 处理错误 2025-06-05 22:17:37 +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
14056b32ae 通知 2025-06-05 21:57:37 +08:00
xman
4d8e3f6986 通知 2025-06-05 21:53:08 +08:00
xman
6ae3d1e163 通知 2025-06-05 21:47:43 +08:00
xman
8a396cbccc 通知 2025-06-05 21:37:05 +08:00
xman
8e581e07c1 通知 2025-06-05 21:35:34 +08:00
xman
c0a7b7d7e8 通知 2025-06-05 21:33:40 +08:00
xman
863a6621fd 通知 2025-06-05 21:27:47 +08:00
xman
fc07256ee5 通知 2025-06-05 21:26:46 +08:00
abdfa0bc28 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-05 21:16:33 +08:00
xman
0548036735 通知 2025-06-05 21:15:41 +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
0b30e8dc52 Accept Merge Request #116: (feature/zy -> develop)
Merge Request: feature: 样式

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/116
2025-06-05 17:05:45 +08:00
zhuyu
c745a00be8 feature: 样式 2025-06-05 17:04:59 +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