Commit Graph

289 Commits

Author SHA1 Message Date
xman
1f4e618561 sth 2025-04-21 14:27:48 +08:00
xman
b72181167e sth 2025-04-21 14:21:56 +08:00
xman
ca133f4153 sth 2025-04-21 14:18:11 +08:00
xman
d7046959aa sth 2025-04-21 11:59:42 +08:00
xman
382d410bea sth 2025-04-21 10:57:51 +08:00
xman
b54d750569 sth 2025-04-21 10:47:19 +08:00
xman
afe08adbc8 sth 2025-04-21 10:40:01 +08:00
xman
4bc3989eff sth 2025-04-21 10:37:21 +08:00
xman
0c14dba469 sth 2025-04-21 10:35:15 +08:00
xman
1abb664a35 sth 2025-04-21 10:27:14 +08:00
xman
06e6261498 sth 2025-04-21 10:20:03 +08:00
xman
ad6e114d2b sth 2025-04-21 10:19:22 +08:00
xman
2e61682f94 sth 2025-04-21 10:17:16 +08:00
xman
47e27cbb85 sth 2025-04-21 10:00:24 +08:00
xman
95be774da9 sth 2025-04-21 09:41:46 +08:00
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
9c0953a45c sth 2025-04-19 21:42:11 +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
6ab546b78f Accept Merge Request #23: (feature/hant -> develop)
Merge Request: 调整

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/23
2025-04-19 17:53:08 +08:00
69642477be 调整 2025-04-19 17:52:55 +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
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
e3dabec8a5 cmd 2025-04-18 15:26:20 +08:00
xman
4ca210b2af cmd 2025-04-18 15:25:10 +08:00
xman
c700360d48 cmd 2025-04-18 15:10:18 +08:00
xman
a45046c5f0 cmd 2025-04-18 15:09:26 +08:00
xman
417c62ce37 cmd 2025-04-18 14:52:54 +08:00
xman
c6bb2deead cmd 2025-04-18 14:52:02 +08:00
xman
c526249f6a cmd 2025-04-18 14:39:12 +08:00
xman
5058caaec3 aftersale 2025-04-18 14:35:56 +08:00
xman
88aa8696ab aftersale 2025-04-18 14:28:38 +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
02fe2e32d8 aftersale 2025-04-18 13:39:04 +08:00
xman
d3f794a517 aftersale 2025-04-18 13:38:30 +08:00
xman
480e7361a9 aftersale 2025-04-18 13:37:53 +08:00
xman
f4cae762e1 aftersale 2025-04-18 10:40:42 +08:00
xman
f448f2d937 sth 2025-04-18 09:38:24 +08:00