Commit Graph

116 Commits

Author SHA1 Message Date
7c9d18eced 1 2024-10-31 11:19:37 +08:00
9662e2951c 1 2024-10-31 11:17:58 +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
4e3d502ae5 收银台打印小票 2024-10-30 14:28:13 +08:00
DESKTOP-369JRHT\12997
fa5ddf6a0b 10.30 2024-10-30 11:32:43 +08:00
a5fc7fbe9a Merge remote-tracking branch 'origin/main' 2024-10-30 10:30:27 +08:00
daa07fbb4b 收银台打印小票 2024-10-29 16:48:20 +08:00
DESKTOP-369JRHT\12997
abdad63b26 10.29 2024-10-29 15:35:48 +08:00
DESKTOP-369JRHT\12997
004e2c8e98 10.29 2024-10-29 15:01:59 +08:00
DESKTOP-369JRHT\12997
d9a0ff3125 10.26 2024-10-28 09:35:42 +08:00
DESKTOP-369JRHT\12997
bd5bba3198 10.25 2024-10-25 14:46:24 +08:00
03673579f5 10.24 2024-10-24 18:01:22 +08:00
d18fa885f8 10.24 2024-10-24 11:44:23 +08:00
zhaohengkun
ae9ee648c6 bug修改 2024-10-22 13:35:39 +08:00
zhaohengkun
0d952a0082 活动相关调整 2024-10-21 10:47:57 +08:00
zhaohengkun
86b9c1997d 优惠券相关修改 2024-10-18 16:45:02 +08:00
zhaohengkun
e8a4da0826 BUG + 收银台调整 2024-10-18 09:33:26 +08:00
37c9eb40ce 10.17 2024-10-17 11:27:25 +08:00
zhaohengkun
3276ced4ae bug1 2024-10-16 16:17:19 +08:00
zhaohengkun
0d42e10334 bug1 2024-10-15 18:11:07 +08:00
1cbdc02c7c 10.14 2024-10-14 16:42:02 +08:00
zhaohengkun
1aee452526 1 2024-10-14 16:32:01 +08:00
zhaohengkun
872cfdc423 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-12 18:11:56 +08:00
zhaohengkun
217fdd006e 修改bug 2024-10-12 18:10:56 +08:00
48f29f4873 10.12 2024-10-12 17:29:35 +08:00
许允枞
a6e0a3022c 更新10.10 2024-10-10 15:45:09 +08:00
许允枞
6341a4b932 更新10.10 2024-10-10 14:14:27 +08:00
许允枞
ac3ee2b0df 更新10.10 2024-10-10 11:49:00 +08:00
2fc94aad3d 营销活动 2024-10-08 11:38:41 +08:00
PQZ
f8c76ba0de 1 2024-09-30 17:31:15 +08:00
584f15ded9 9.29 2024-09-29 16:40:07 +08:00
PQZ
6a95c2833a 1 2024-09-26 17:19:45 +08:00
PQZ
75815cf4b0 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-09-26 17:13:54 +08:00
PQZ
1c6df767a5 适用商品 2024-09-26 17:13:51 +08:00
3f93dd7ade 营销活动 2024-09-26 15:19:59 +08:00
zhaohengkun
c5068f7ea1 修改bug 2024-09-25 14:56:16 +08:00
zhaotianfeng
6833b81a2b 修改bug 2024-09-25 11:53:41 +08:00
05c1363139 处理数据 2024-09-22 16:37:06 +08:00
b68287a4dc 处理数据 2024-09-21 09:24:50 +08:00
6a3d7af6c1 处理 2024-09-19 14:33:28 +08:00
45c78f6413 9.19 2024-09-19 13:54:46 +08:00
cffc29c555 9.19 2024-09-19 10:41:11 +08:00
f447a99058 9.19 2024-09-19 08:50:24 +08:00
941f32aeac 9.18 2024-09-18 17:24:03 +08:00
c111107dac 9.18 2024-09-18 13:34:55 +08:00
fd148c3404 9.18 2024-09-18 11:35:58 +08:00
xvv
1ee07bf869 9.18 2024-09-18 09:37:28 +08:00
c2f8720cbb 数据库设计 2024-09-17 16:51:52 +08:00
d158529d79 9.17 2024-09-17 11:18:25 +08:00
50facae364 9.16 2024-09-16 16:30:12 +08:00