Commit Graph

90 Commits

Author SHA1 Message Date
sw
f35039da9b 11.14 2024-11-14 14:04:58 +08:00
sw
28d72ff386 11.14 2024-11-14 09:16:39 +08:00
1d407ffa3f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
2024-10-31 08:46:31 +08:00
207ecefc50 10.30 2024-10-30 15:52:14 +08:00
zhaohengkun
557d377ef5 1 2024-10-30 14:38:47 +08:00
zhaohengkun
7a045a9e71 1 2024-10-30 11:29:09 +08:00
a5fc7fbe9a Merge remote-tracking branch 'origin/main' 2024-10-30 10:30:27 +08:00
zhaohengkun
839c5f5226 1 2024-10-29 16:09:01 +08:00
581cefa9b3 10.29 2024-10-29 15:40:39 +08:00
9a9ff1dca2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
2024-10-29 14:55:50 +08:00
zhaohengkun
bafcf724f1 1 2024-10-29 11:35:05 +08:00
ds
1d27ad0873 10.28 2024-10-28 18:02:31 +08:00
45757fd59d 10.28 2024-10-28 10:36:06 +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
2a3f80675e 收银台打印小票 2024-10-26 14:05:42 +08:00
zhaohengkun
d0c8769c5d bug 2024-10-24 16:36:30 +08:00
d18fa885f8 10.24 2024-10-24 11:44:23 +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
e7b2df5001 10.22 2024-10-22 11:10:03 +08:00
9de246a8e5 10.22 2024-10-22 10:42:47 +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
2dfb19b84d 10.18 2024-10-18 17:10:18 +08:00
zhaohengkun
f516365a5a Merge remote-tracking branch 'origin/main' 2024-10-18 10:43:59 +08:00
zhaohengkun
a5ac9ecaa5 收银台调整 2024-10-18 10:43:49 +08:00
900b460852 10.18 2024-10-18 10:37:53 +08:00
zhaohengkun
48e0da0a92 收银台调整 2024-10-18 10:24:06 +08:00
zhaohengkun
8746387651 BUG + 收银台调整 2024-10-18 10:04:57 +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
a9727156f7 10.17 2024-10-17 17:46:51 +08:00
1da831fd2b 10.16 2024-10-16 11:31:40 +08:00
8a4189a778 10.15 2024-10-15 16:09:34 +08:00
977648f815 10.15 2024-10-15 14:27:49 +08:00
681cfddf20 10.14 2024-10-14 18:00:48 +08:00
zhaohengkun
1aee452526 1 2024-10-14 16:32:01 +08:00
987ecc70df 10.14 2024-10-14 16:16:07 +08:00
zhaohengkun
dea17c543e 1 2024-10-14 14:50:36 +08:00
5ec65bef7b 10.12 2024-10-12 11:43:08 +08:00
zhaohengkun
7121aaccf0 1 2024-10-12 09:01:34 +08:00
zhaohengkun
ac483aee69 1 2024-10-11 17:17:09 +08:00
zhaohengkun
3bc9fcf7ae 对参数 2024-10-10 19:48:32 +08:00
fc39df7628 营销活动 2024-10-10 18:52:22 +08:00
DESKTOP-369JRHT\12997
94fb9e5b34 10.9 2024-10-10 15:07:52 +08:00
89fe6b7fa8 营销活动 2024-10-09 17:32:17 +08:00
DESKTOP-369JRHT\12997
3d087f8f5c 10.9 2024-10-09 17:23:11 +08:00
deb3db0b95 营销活动 2024-10-08 14:11:20 +08:00