Commit Graph

327 Commits

Author SHA1 Message Date
202399cfbf 收银台打印小票 2024-10-28 09:26:02 +08:00
3e812bd148 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
2024-10-26 14:58:39 +08:00
d479583f49 收银台打印小票 2024-10-26 14:57:28 +08:00
2a3f80675e 收银台打印小票 2024-10-26 14:05:42 +08:00
ds
66e0810d56 10.25 2024-10-25 18:07:55 +08:00
73576a54ae 10.25 2024-10-25 17:51:00 +08:00
42b9df78a8 10.25 2024-10-25 16:41:51 +08:00
3937a4d0f2 10.25 2024-10-25 14:56:56 +08:00
130e8556ac 10.25 2024-10-25 13:46:53 +08:00
zhaohengkun
a25303b23a Merge remote-tracking branch 'origin/main' 2024-10-25 11:49:03 +08:00
zhaohengkun
2aa71233f3 1 2024-10-25 11:48:41 +08:00
ds
5541b75d61 10.24-现金支付时优惠券bug测试及修复 2024-10-25 11:41:50 +08:00
ds
383f52870b 10.24 2024-10-24 18:53:29 +08:00
zhaohengkun
f035fda9e1 bug 2024-10-24 18:10:18 +08:00
82bbcefc9c 10.24 2024-10-24 17:04:51 +08:00
ds
4cb9cb3692 收银系统-订单-后端功能 2024-10-24 17:01:00 +08:00
zhaohengkun
d0c8769c5d bug 2024-10-24 16:36:30 +08:00
846ce4c33f 10.24 2024-10-24 16:25:56 +08:00
0ca0656f4d 10.24 2024-10-24 15:39:10 +08:00
d18fa885f8 10.24 2024-10-24 11:44:23 +08:00
zhaohengkun
51bc0851f9 1 2024-10-24 10:10:25 +08:00
zhaohengkun
9eceda0858 bug 2024-10-24 09:30:33 +08:00
953c53696c 10.23 2024-10-23 17:12:34 +08:00
1db289de63 后端修改小票配置打印和小票动态打印 2024-10-23 16:27:04 +08:00
5dec74f184 10.23 2024-10-23 15:43:06 +08:00
198c25ea5b 10.23 2024-10-23 11:13:47 +08:00
3a590eb4b3 10.23 2024-10-23 10:06:02 +08:00
zhaohengkun
8d28b9aef5 1 2024-10-23 09:07:36 +08:00
219dfa5cb4 10.22 2024-10-22 16:01:59 +08:00
zhaohengkun
ae9ee648c6 bug修改 2024-10-22 13:35:39 +08:00
zhaohengkun
75f2c2b3ad bug修改 2024-10-22 11:16:59 +08:00
DESKTOP-369JRHT\12997
b773788839 10.19 2024-10-19 18:03:31 +08:00
Lx
98d534976a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
2024-10-18 18:21:19 +08:00
Lx
435b10db7b 中台系统设置部分Bug;首页通知中心接口 2024-10-18 18:17:40 +08:00
zhaohengkun
3b2da37b27 1 2024-10-18 18:06:04 +08:00
2dfb19b84d 10.18 2024-10-18 17:10:18 +08:00
zhaohengkun
86b9c1997d 优惠券相关修改 2024-10-18 16:45:02 +08:00
cecae110c7 10.18 2024-10-18 11:03:09 +08:00
900b460852 10.18 2024-10-18 10:37:53 +08:00
zhaohengkun
a40e1e29e7 1 2024-10-18 10:03:47 +08:00
zhaohengkun
826fd38add 1 2024-10-18 09:47:34 +08:00
zhaohengkun
68a94aa3fc Merge remote-tracking branch 'origin/main' 2024-10-18 09:34:48 +08:00
zhaohengkun
e8a4da0826 BUG + 收银台调整 2024-10-18 09:33:26 +08:00
a7272a1b4f 10.18 2024-10-18 09:30:32 +08:00
Lx
eabfb9bd1f 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
Lx
e560658211 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
a9727156f7 10.17 2024-10-17 17:46:51 +08:00
8ab3e3780a 10.17 2024-10-17 15:48:58 +08:00
许允枞
4a4d53fcda 更新10.17 2024-10-17 11:36:29 +08:00
许允枞
4687084528 更新10.16 2024-10-16 18:28:23 +08:00