Commit Graph

702 Commits

Author SHA1 Message Date
ds
e4ccde8651 10.26 2024-10-26 18:08:58 +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
DESKTOP-369JRHT\12997
bd5bba3198 10.25 2024-10-25 14:46:24 +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
6d672850da Merge remote-tracking branch 'origin/main' into main 2024-10-25 09:13:33 +08:00
DESKTOP-369JRHT\12997
6163dec554 10.25 2024-10-25 09:07:52 +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
03673579f5 10.24 2024-10-24 18:01:22 +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
DESKTOP-369JRHT\12997
a34eca0af1 10.24 2024-10-24 14:20:20 +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
2c0eee83cf 10.23 2024-10-23 17:56:17 +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
ds
74e06e1c11 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-10-23 10:09:33 +08:00
3a590eb4b3 10.23 2024-10-23 10:06:02 +08:00
ds
dc552e4c48 10.22 2024-10-23 09:56:07 +08:00
zhaohengkun
8d28b9aef5 1 2024-10-23 09:07:36 +08:00
DESKTOP-369JRHT\12997
a625342084 10.23 2024-10-23 08:52:43 +08:00
219dfa5cb4 10.22 2024-10-22 16:01:59 +08:00
zhaohengkun
ae9ee648c6 bug修改 2024-10-22 13:35:39 +08:00
4e676c7e8b 10.22 2024-10-22 11:42:51 +08:00
zhaohengkun
75f2c2b3ad bug修改 2024-10-22 11:16:59 +08:00
e7b2df5001 10.22 2024-10-22 11:10:03 +08:00
9de246a8e5 10.22 2024-10-22 10:42:47 +08:00
9741831c8d Merge remote-tracking branch 'origin/main' 2024-10-22 10:30:12 +08:00
0d5d6ff11d 10.22 2024-10-22 10:29:38 +08:00
DESKTOP-369JRHT\12997
b897fa3629 10.22 2024-10-22 10:29:38 +08:00
DESKTOP-369JRHT\12997
cdb9262c12 10.22 2024-10-22 10:05:09 +08:00
zhaohengkun
0d952a0082 活动相关调整 2024-10-21 10:47:57 +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