|
|
eef4c1a5b4
|
Accept Merge Request #24: (feature/hant -> develop)
Merge Request: 调整
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/24?initial=true
|
2025-04-19 22:17:55 +08:00 |
|
|
|
6ab562edf4
|
调整
|
2025-04-19 22:16:36 +08:00 |
|
xman
|
f64c6808f3
|
sth
|
2025-04-19 21:51:10 +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
|
9d055a1dfe
|
审核
|
2025-04-18 17:19:04 +08:00 |
|
xman
|
fb99b2dbe6
|
审核
|
2025-04-18 16:54:52 +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
|
579166b5e9
|
cmd
|
2025-04-18 15:47:37 +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 |
|
|
|
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
|
64b2c282ff
|
sth
|
2025-04-17 10:14:26 +08:00 |
|
|
|
a916c55786
|
开票
|
2025-04-16 17:51:41 +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
|
dd67cb9d13
|
添加日志
|
2025-04-15 17:58:27 +08:00 |
|
xman
|
b907583658
|
添加日志
|
2025-04-14 11:28:10 +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
|
fad7b7d4a3
|
feature: task
|
2025-04-06 14:10:46 +08:00 |
|
zhuyu
|
a3629141d3
|
feature: task
|
2025-04-06 13:41:02 +08:00 |
|
|
|
0a333ab742
|
Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
# composer.json
# composer.lock
|
2025-04-01 20:32:13 +08:00 |
|
xman
|
fb650c85cb
|
record
|
2025-04-01 18:20:23 +08:00 |
|
xman
|
ee367f5a76
|
record
|
2025-04-01 18:19:15 +08:00 |
|
|
|
bbde06adb1
|
识别
|
2025-04-01 17:20:28 +08:00 |
|
xman
|
d037ec193d
|
record
|
2025-04-01 17:19:25 +08:00 |
|
xman
|
c5db908603
|
hook
|
2025-04-01 15:46:37 +08:00 |
|
xman
|
01f4316d80
|
hook
|
2025-03-31 15:59:33 +08:00 |
|
xman
|
79fe024c06
|
text
|
2025-03-31 14:57:18 +08:00 |
|
xman
|
501b1a7bde
|
text
|
2025-03-31 14:27:41 +08:00 |
|
xman
|
066c6fb584
|
text
|
2025-03-31 14:15:54 +08:00 |
|
zhuyu
|
7e535c03b0
|
feature: task
|
2025-03-30 17:59:00 +08:00 |
|
zhuyu
|
b5c32bb8ad
|
Merge branch 'develop' into feature/zy
|
2025-03-30 16:54:49 +08:00 |
|
|
|
e8a7dbddc3
|
订单数据
|
2025-03-30 16:29:32 +08:00 |
|
xman
|
09e94cd7b3
|
配置订单
|
2025-03-29 21:40:16 +08:00 |
|
xman
|
d3d63f4872
|
修改派单
|
2025-03-29 20:54:18 +08:00 |
|
