Commit Graph

485 Commits

Author SHA1 Message Date
f0806e7cfc Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/common/Logic/NoticeLogic.php
2025-06-04 10:49:13 +08:00
2e4ddc3f61 关闭 call 2025-06-04 10:47:13 +08:00
zhuyu
d842125c88 Accept Merge Request #107: (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/107
2025-06-04 10:18:50 +08:00
zhuyu
cc4180b27d feature: auth 2025-06-04 10:17:35 +08:00
zhuyu
9fefc01a25 Accept Merge Request #106: (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/106
2025-06-04 10:08:59 +08:00
zhuyu
28f3154a9e feature: auth 2025-06-04 10:06:46 +08:00
zhuyu
b990c5d62a feature: auth 2025-06-04 09:59:37 +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
32848f79e8 feature: 按钮名称 2025-06-04 09:26:37 +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
45172a0f6d feature: salary menu 2025-06-03 23:31:46 +08:00
zhuyu
137695c02a feature: salary menu 2025-06-03 23:30:42 +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
zhuyu
f1af5c7930 Accept Merge Request #101: (feature/zy -> develop)
Merge Request: feature: salary auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/101
2025-06-03 22:56:38 +08:00
zhuyu
5f2033f90c feature: salary auth 2025-06-03 22:55:52 +08:00
zhuyu
049f771ce4 feature: salary auth 2025-06-03 22:52:28 +08:00
zhuyu
0f7cdc61a9 Accept Merge Request #100: (feature/zy -> develop)
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/100
2025-06-03 18:07:12 +08:00
zhuyu
cf39aa4326 feature: 按钮名称 2025-06-03 18:06:40 +08:00
zhuyu
998cb993e4 Accept Merge Request #99: (feature/zy -> develop)
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/99
2025-06-03 17:48:26 +08:00
zhuyu
ee2d779f71 feature: 按钮名称 2025-06-03 17:29:50 +08:00
98ab885f28 修改 2025-06-03 16:40:39 +08:00
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
41dd493e57 修改 2025-06-03 11:51:01 +08:00
xman
25adfb36fc 通知 2025-06-02 20:48:01 +08:00
xman
1e13c81f16 通知 2025-06-02 20:45:29 +08:00
xman
68f629d74b 通知 2025-06-02 20:26:56 +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
282758e23a 接单成功 2025-06-02 18:53:03 +08:00
xman
b59216e941 接单成功 2025-06-02 18:46:56 +08:00
xman
77db49e9f6 Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-06-02 18:37:45 +08:00
xman
c5cd79edd5 上门前提醒 2025-06-02 18:37:32 +08:00
zhuyu
ba6bf8ae65 Accept Merge Request #95: (feature/zy -> develop)
Merge Request: feature: task notice

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/95
2025-06-02 17:43:16 +08:00
zhuyu
14c8801cba feature: task notice 2025-06-02 17:42:39 +08:00
xman
c1ac4bf315 sth 2025-06-02 15:19:53 +08:00
xman
beaa0a32a9 sth 2025-06-02 15:13:51 +08:00
xman
51b3dec40c 完成订单重构 2025-06-02 15:12:41 +08:00
xman
b6cc5c5cc6 完成订单重构 2025-06-02 14:08:34 +08:00
xman
5a6642ea1f 完成订单重构 2025-06-02 13:55:57 +08:00
xman
ddffac5b74 完成订单重构 2025-06-02 12:56:21 +08:00
xman
4874a8cae8 完成订单重构 2025-06-02 12:52:52 +08:00
zhuyu
f25f1bb262 feature: task notice 2025-06-02 12:21:17 +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