Commit Graph

434 Commits

Author SHA1 Message Date
xman
bcfa38d16e sth 2025-03-10 14:09:57 +08:00
xman
34728ca220 sth 2025-03-10 14:04:45 +08:00
xman
c296c743db sth 2025-03-10 13:58:04 +08:00
xman
54d79c0197 sth 2025-03-10 13:57:39 +08:00
xman
eb7e22ca40 sth 2025-03-10 11:49:38 +08:00
xman
1729d3cf8b sth 2025-03-10 11:28:47 +08:00
xman
311e6f8b86 sth 2025-03-10 10:43:04 +08:00
xman
141362cc51 sth 2025-03-10 10:41:43 +08:00
xman
ef30554fa2 Merge branch 'develop' into feature/xman 2025-03-10 09:52:31 +08:00
650d78b73a 黑明单管理 2025-03-09 21:40:36 +08:00
3264048624 Accept Merge Request #7: (feature/hant -> develop)
Merge Request: 订单录入

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/7?initial=true
2025-03-08 16:40:18 +08:00
328d08e1d8 订单录入 2025-03-08 16:39:37 +08:00
df6b53bde3 Accept Merge Request #6: (feature/hant -> develop)
Merge Request: 店铺管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/6
2025-03-08 16:25:31 +08:00
7228cc267a 订单录入 2025-03-08 16:24:54 +08:00
7690b1e40f 添加优惠码,工作机 2025-03-08 15:39:17 +08:00
72523df3fa 店铺管理 2025-03-06 22:56:05 +08:00
60d4baae4e Merge remote-tracking branch 'origin/develop' into feature/hant 2025-03-06 21:03:17 +08:00
zhuyu
b740f4ad8f feature: task 2025-03-06 16:37:44 +08:00
xman
dc20f54a4e sth 2025-03-06 15:50:31 +08:00
xman
970ad2e58b sth 2025-03-06 15:49:37 +08:00
xman
dbe39286a3 sth 2025-03-05 23:19:36 +08:00
47d26431c7 Accept Merge Request #5: (feature/hant -> master)
Merge Request: 服务内容管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/5?initial=true
2025-03-05 23:18:13 +08:00
4f289c00d5 服务内容管理 2025-03-05 23:16:59 +08:00
xman
204afd4005 Merge branch 'feature/xman' into develop 2025-03-05 20:56:39 +08:00
xman
6ffc678158 sth 2025-03-05 20:56:22 +08:00
xman
ce92078a61 Merge branch 'feature/xman' into develop 2025-03-05 20:53:49 +08:00
xman
a7e4ce07ab 回访 2025-03-05 20:53:32 +08:00
xman
94c6ba065e Merge branch 'feature/xman' into develop 2025-03-05 20:52:22 +08:00
xman
07c4f93ab7 回访 2025-03-05 20:51:43 +08:00
xman
072b2aa3bd Merge branch 'feature/xman' into develop 2025-03-05 17:19:01 +08:00
xman
4e42993114 回访 2025-03-05 17:18:28 +08:00
xman
21f866d286 作用域条件 2025-03-05 17:06:22 +08:00
7c0b57fc93 Accept Merge Request #4: (feature/hant -> develop)
Merge Request: 添加服务内容管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/4?initial=true
2025-03-04 22:04:59 +08:00
08338b8373 添加服务内容管理 2025-03-04 22:04:28 +08:00
xman
bd66abc4a2 css 2025-03-04 16:08:54 +08:00
b93a626cfa Accept Merge Request #3: (feature/hant -> develop)
Merge Request: 订单编辑

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/3?initial=true
2025-03-04 10:18:06 +08:00
a12a83a549 订单编辑 2025-03-04 10:17:22 +08:00
xman
0d13556380 css 2025-03-04 10:02:58 +08:00
xman
7e102fc193 css 2025-03-04 10:02:40 +08:00
xman
ecc1874e0c Merge branch 'develop' into feature/xman 2025-03-04 09:49:58 +08:00
xman
2dabba3ae7 css 2025-03-04 09:49:31 +08:00
d9916c782d Accept Merge Request #2: (feature/hant -> develop)
Merge Request: 订单模块

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/2?initial=true
2025-03-03 22:00:24 +08:00
xman
9492976638 css 2025-03-03 18:14:01 +08:00
xman
8e4b1f5bba income 2025-03-03 17:50:58 +08:00
xman
bec0aec8f9 log 2025-03-03 17:38:12 +08:00
17990bfa98 订单模块 2025-03-03 17:38:06 +08:00
xman
13b6bf42ae log 2025-03-03 17:38:00 +08:00
xman
8125df124a 师傅 2025-03-03 17:37:30 +08:00
2a2f420de1 Accept Merge Request #1: (feature/hant -> develop)
Merge Request: Merge remote-tracking branch 'origin/develop' into feature/hant

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/1?initial=true
2025-03-03 17:14:22 +08:00
737a495884 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	public/assets/js/backend/order.js
2025-03-03 17:10:26 +08:00