hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,151 Commits 6 Branches 0 Tags 33 MiB
f90e1ed9b4
Commit Graph

569 Commits

Author SHA1 Message Date
xman
871a8c396c sth 2025-06-28 19:18:55 +08:00
xman
a64640247b sth 2025-06-28 19:13:43 +08:00
xman
6f4dde697a sth 2025-06-28 19:08:06 +08:00
大狗哥
d619ffde69 Accept Merge Request #196: (feature/dgg -> develop) 
Merge Request: fix: 修复后台删除师傅时，未同步删除师傅第三方账户表中数据

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/196
 2025-06-27 23:41:20 +08:00
gcd
3cf3fa44ec fix: 修复后台删除师傅时，未同步删除师傅第三方账户表中数据 2025-06-27 23:39:52 +08:00
hant
86645f28a1 修复问题 2025-06-27 22:26:38 +08:00
todayswind
136804c074 Accept Merge Request #194: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/194?initial=true
 2025-06-27 18:07:17 +08:00
todaywindy
ad20e45ffa 修改 2025-06-27 18:06:27 +08:00
todayswind
8e382b3cbc Accept Merge Request #193: (feature/hant -> develop) 
Merge Request: 数据处理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/193?initial=true
 2025-06-27 17:11:00 +08:00
todaywindy
ad95e1d721 数据处理 2025-06-27 17:09:43 +08:00
xman
2be096d0fe sth 2025-06-27 16:25:42 +08:00
xman
08459b02df sth 2025-06-27 16:09:17 +08:00
todaywindy
403ff850e8 Merge remote-tracking branch 'origin/develop' into develop 2025-06-27 16:02:57 +08:00
todaywindy
4c14780e82 修改 2025-06-27 16:02:47 +08:00
xman
5fb9b6fc0a sth 2025-06-27 15:49:15 +08:00
xman
090890f7e2 sth 2025-06-27 11:20:01 +08:00
zhuyu
a3980076f0 Accept Merge Request #190: (feature/zy -> develop) 
Merge Request: feature: 排班优化

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/190
 2025-06-27 10:04:37 +08:00
zhuyu
8d7aceaf70 feature: 排班优化 2025-06-27 10:03:01 +08:00
hant
a0d6ad35e9 修复问题 2025-06-26 23:01:53 +08:00
todayswind
69e37ea26e Accept Merge Request #188: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/188?initial=true
 2025-06-26 16:01:43 +08:00
todaywindy
df6a33cc7d 修改 2025-06-26 16:00:57 +08:00
zhuyu
6400ab5515 Accept Merge Request #186: (feature/zy -> develop) 
Merge Request: feature: 排班

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/186
 2025-06-26 14:59:58 +08:00
zhuyu
2e491586ad feature: 排班 2025-06-26 14:57:27 +08:00
zhuyu
962177d12e feature: 添加排班 2025-06-26 14:53:24 +08:00
todayswind
aa0a85f9fe Accept Merge Request #185: (feature/hant -> develop) 
Merge Request: 通知

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/185?initial=true
 2025-06-26 14:33:48 +08:00
todaywindy
7c79ee8045 通知 2025-06-26 14:32:55 +08:00
todayswind
8b3c98980c Accept Merge Request #184: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/184?initial=true
 2025-06-26 14:28:00 +08:00
todaywindy
e9dce2407d 修改 2025-06-26 14:27:15 +08:00
zhuyu
e2a359399a Accept Merge Request #183: (feature/zy -> develop) 
Merge Request: feature: kpi

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/183
 2025-06-25 18:02:53 +08:00
zhuyu
1ae192cf69 feature: kpi 2025-06-25 18:01:08 +08:00
todayswind
30658e9bb6 Accept Merge Request #181: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/181?initial=true
 2025-06-25 11:48:56 +08:00
todaywindy
7dd30af6ad 修改 2025-06-25 11:47:43 +08:00
zhuyu
ddf7720aab feature: 排班表 2025-06-25 11:07:33 +08:00
zhuyu
d6adb76d79 feature: 排班表 2025-06-25 11:07:24 +08:00
zhuyu
bc3cf6a8f6 feature: 排班表 2025-06-25 11:04:51 +08:00
zhuyu
c9411815dd feature: 权限 2025-06-25 10:57:07 +08:00
zhuyu
81bc56f571 feature: 组筛选 2025-06-24 17:59:12 +08:00
todayswind
b3aaff2238 Accept Merge Request #178: (feature/hant -> develop) 
Merge Request: 取消订单日志

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/178?initial=true
 2025-06-24 15:07:58 +08:00
todaywindy
c39e3c01da 取消订单日志 2025-06-24 14:53:07 +08:00
todayswind
1cbb5628c6 Accept Merge Request #176: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/176?initial=true
 2025-06-23 14:28:05 +08:00
todaywindy
3f12333026 修改 2025-06-23 14:27:19 +08:00
todayswind
e8fec5fb6a Accept Merge Request #175: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/175?initial=true
 2025-06-23 11:54:33 +08:00
todaywindy
968fc2cc8e 修改 2025-06-23 11:51:28 +08:00
zhuyu
767b033647 Accept Merge Request #174: (feature/zy -> develop) 
Merge Request: feature: gzt

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/174
 2025-06-23 11:40:12 +08:00
zhuyu
3c1ba87518 feature: gzt 2025-06-23 11:39:04 +08:00
todaywindy
a54769e075 修改 2025-06-23 10:31:49 +08:00
todayswind
e4ce0feef3 Accept Merge Request #168: (feature/hant -> develop) 
Merge Request: 退单统计

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/168?initial=true
 2025-06-22 18:42:28 +08:00
hant
02dbc1233a 退单统计 2025-06-22 18:41:46 +08:00
xman
b4fe76cb3c sth 2025-06-22 18:29:19 +08:00
xman
f1957a347b sth 2025-06-22 18:13:05 +08:00
hant
2b209eef1e 创建分类 2025-06-22 16:38:09 +08:00
hant
370f9ec304 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-21 19:47:43 +08:00
hant
01dd67db11 创建分类 2025-06-21 19:47:34 +08:00
xman
bceea13d7e Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:52:56 +08:00
xman
f7a32b9321 sth 2025-06-20 16:52:35 +08:00
todayswind
cd4a63e381 Accept Merge Request #163: (feature/hant -> develop) 
Merge Request: 添加搜索以及退款信息

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/163?initial=true
 2025-06-20 16:49:36 +08:00
todaywindy
7fa8e964c9 添加搜索以及退款信息 2025-06-20 16:48:41 +08:00
xman
10cff56e96 Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:14:27 +08:00
xman
f776e55756 sth 2025-06-20 16:14:03 +08:00
zhuyu
0cdfb5576b Accept Merge Request #162: (feature/zy -> develop) 
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/162?initial=true
 2025-06-20 16:06:03 +08:00
zhuyu
344466f013 feature: 权限 2025-06-20 16:04:52 +08:00
xman
f85c2988ca Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 15:48:32 +08:00
xman
9953cbcfac sth 2025-06-20 15:48:11 +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
bc9aa3fb57 sth 2025-06-19 15:20:46 +08:00
xman
d73e008d58 sth 2025-06-19 14:57:51 +08:00
xman
8c42814d5e sth 2025-06-19 09:35:18 +08:00
todaywindy
b3ba64a651 添加消息 2025-06-18 16:49:05 +08:00
todayswind
4f703b57a7 Accept Merge Request #155: (feature/hant -> develop) 
Merge Request: 派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/155?initial=true
 2025-06-18 11:15:46 +08:00
todaywindy
cf2fa22190 派单 2025-06-18 11:14:55 +08:00
todayswind
af251b9d37 Accept Merge Request #154: (feature/hant -> develop) 
Merge Request: 地图派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/154?initial=true
 2025-06-18 10:16:24 +08:00
todaywindy
0103120071 地图派单 2025-06-18 10:14:29 +08:00
xman
c1d6259bc9 sth 2025-06-18 10:08:42 +08:00
hant
e21d9d615c 地区搜索 2025-06-17 23:07:17 +08:00
hant
3d46ec1ee0 问题修复 2025-06-17 21:50:04 +08:00
todaywindy
4b1ade55b8 取消订单问题 2025-06-17 17:11:28 +08:00
xman
4c7101ab80 sth 2025-06-17 15:34:28 +08:00
xman
6b4af27857 sth 2025-06-17 15:23:00 +08:00
xman
d0efa47ab3 sth 2025-06-17 15:22:26 +08:00
xman
ace5bd7f36 sth 2025-06-17 15:04:33 +08:00
hant
a00c55b8ee Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-16 23:12:12 +08:00
hant
f78d784441 问题修复 2025-06-16 23:12:01 +08:00
xman
18e48f793b 地址 2025-06-16 22:20:40 +08:00
xman
5b4c2994c9 地址 2025-06-16 21:56:43 +08:00
xman
797c093b63 地址 2025-06-16 21:44:05 +08:00
xman
e5f0572c3f 地址 2025-06-16 21:39:47 +08:00
xman
e24f5f0449 地址 2025-06-16 21:23:52 +08:00
xman
a02eaeb3a8 地址 2025-06-16 21:21:46 +08:00
hant
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
5896d2171e sb 2025-06-16 16:35:02 +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