Commit Graph

156 Commits

Author SHA1 Message Date
xman
95be774da9 sth 2025-04-21 09:41:46 +08:00
xman
f27397c8c1 审核 2025-04-19 21:38:56 +08:00
xman
acfb1a7371 审核 2025-04-19 21:27:54 +08:00
xman
910e720583 审核 2025-04-19 21:20:54 +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
314fa09210 审核 2025-04-18 18:12:33 +08:00
xman
b5c9f6e29b 审核 2025-04-18 17:25:28 +08:00
xman
9d055a1dfe 审核 2025-04-18 17:19:04 +08:00
xman
bb80209ffb cmd 2025-04-18 16:37:28 +08:00
xman
b50c182e24 cmd 2025-04-18 15:55:18 +08:00
xman
e3dabec8a5 cmd 2025-04-18 15:26:20 +08:00
xman
4ca210b2af cmd 2025-04-18 15:25:10 +08:00
xman
5058caaec3 aftersale 2025-04-18 14:35:56 +08:00
xman
d3d4f6c2e9 aftersale 2025-04-18 14:22:46 +08:00
xman
d810221943 aftersale 2025-04-18 14:00:43 +08:00
xman
9774fb8385 aftersale 2025-04-18 13:55:09 +08:00
xman
f4cae762e1 aftersale 2025-04-18 10:40:42 +08:00
57caec1805 调整 2025-04-17 23:05:48 +08:00
xman
76aa236cbd sth 2025-04-17 18:05:01 +08:00
xman
3af4172660 sth 2025-04-17 16:55:10 +08:00
e36704bd28 Accept Merge Request #21: (feature/hant -> develop)
Merge Request: 开票

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/21?initial=true
2025-04-17 11:18:45 +08:00
1ac760222c 开票 2025-04-17 11:17:40 +08:00
xman
19b255c404 sth 2025-04-17 10:46:48 +08:00
xman
64b2c282ff sth 2025-04-17 10:14:26 +08:00
a916c55786 开票 2025-04-16 17:51:41 +08:00
xman
72d03eba45 Merge branch 'feature/xman' into develop 2025-04-16 10:31:50 +08:00
xman
5bce8cf36c sth 2025-04-16 10:27:30 +08:00
xman
9796c6ba53 sth 2025-04-16 09:28:07 +08:00
16aeb48c8f Accept Merge Request #20: (feature/hant -> develop)
Merge Request: 订单操作

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/20?initial=true
2025-04-15 22:36:09 +08:00
6b5d8df018 订单操作 2025-04-15 22:32:43 +08:00
xman
eab24c03a5 sth 2025-04-15 17:58:57 +08:00
xman
dd67cb9d13 添加日志 2025-04-15 17:58:27 +08:00
xman
361008509a 添加日志 2025-04-14 11:31:10 +08:00
xman
b907583658 添加日志 2025-04-14 11:28:10 +08:00
xman
a37cd1b7f3 sth 2025-04-12 20:20:11 +08:00
xman
aed7236fe3 sth 2025-04-12 20:17:42 +08:00
xman
02cd6b94c7 sth 2025-04-12 20:08:12 +08:00
xman
8424126ffd sth 2025-04-12 19:54:05 +08:00
xman
ebc11c0513 sth 2025-04-12 19:32:15 +08:00
xman
d4521e4410 sth 2025-04-12 18:46:27 +08:00
017d9456c3 添加订单取消 2025-04-10 21:55:43 +08:00
6d9772e6c9 取消订单 2025-04-09 20:21:49 +08:00
c71ca560c8 添加订单报错 2025-04-08 22:07:27 +08:00
a36fe34eab Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-08 20:47:45 +08:00
zhuyu
cf1b76c0ab Accept Merge Request #16: (feature/zy -> develop)
Merge Request: feature: task

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/16?initial=true
2025-04-07 09:25:32 +08:00
zhuyu
0c557472c7 feature: task 2025-04-06 15:32:08 +08:00
zhuyu
a3629141d3 feature: task 2025-04-06 13:41:02 +08:00
ed63962d56 派单员添加区域过滤 2025-04-02 22:43:14 +08:00
cee37cad21 订单数据 2025-04-01 23:03:44 +08:00