Commit Graph

142 Commits

Author SHA1 Message Date
40afd862da Merge remote-tracking branch 'origin/master' 2023-11-20 09:22:30 +08:00
61fd49e3c4 满减优惠券 2023-11-20 09:22:14 +08:00
wangh
516f80e57b 收银台 2023-11-17 16:38:17 +08:00
b9b49fcb62 收银台 2023-11-17 16:33:36 +08:00
435e6feb10 会员等级 2023-11-17 15:39:55 +08:00
88053d1a20 修改会员等级 2023-11-17 15:21:40 +08:00
40c0b630e2 Merge remote-tracking branch 'origin/master' 2023-11-17 13:09:40 +08:00
9fee58ebd7 修改卡券Bug 2023-11-17 13:09:28 +08:00
wangh
478e6fc8f8 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-17 11:14:45 +08:00
wangh
de70f12c56 油枪 2023-11-17 11:14:36 +08:00
6f1406f8c6 收银台 2023-11-16 19:00:57 +08:00
wangh
4ef7e1cdca Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintCashierWeb/.env.development
2023-11-16 18:42:37 +08:00
wangh
b1329a0dcc 积分兑换 2023-11-16 18:40:50 +08:00
b9f4fad30f 卡券核销 2023-11-16 18:31:29 +08:00
758442ff37 Merge remote-tracking branch 'origin/master' 2023-11-15 19:36:20 +08:00
8581ade77e 新人有礼 2023-11-15 19:36:12 +08:00
5bafce40c5 收银台 2023-11-15 18:48:07 +08:00
1c320b17c1 折扣营销 2023-11-15 18:26:05 +08:00
88e9ba8bc9 Merge remote-tracking branch 'origin/master' 2023-11-15 14:34:45 +08:00
925c8cc402 修改消费有礼bug 2023-11-15 14:34:34 +08:00
757d9c5adb 收银台 2023-11-14 19:00:25 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
684598000e Merge remote-tracking branch 'origin/master' 2023-11-14 11:20:29 +08:00
9d79c997a6 营销活动 2023-11-14 11:20:08 +08:00
4f69e72145 Merge remote-tracking branch 'origin/master' 2023-11-13 19:01:25 +08:00
f72db0c784 收银台 2023-11-13 18:59:13 +08:00
wangh
f2a65be97f 存油 2023-11-13 18:58:31 +08:00
wangh
22aee4bb01 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-13 16:54:24 +08:00
wangh
70e1dc3d3d 余额充值 2023-11-13 16:53:12 +08:00
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
c31617ed7f 收银台 2023-11-13 16:51:38 +08:00
79134699fd 收银台 2023-11-11 18:04:49 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
c9c66c61dd 收银台 2023-11-11 13:54:24 +08:00
wangh
b1b4e1c94d 积分 2023-11-10 18:19:33 +08:00
42b625266d 收银台 2023-11-10 18:10:23 +08:00
62f5e61959 收银台 2023-11-10 14:59:23 +08:00
79cded741a 收银台 2023-11-09 18:52:12 +08:00
DESKTOP-369JRHT\12997
46e0745947 积分设置 2023-11-09 18:31:36 +08:00
d1e5ca4140 修改优惠券id 2023-11-09 13:53:03 +08:00
a3f8c672f1 收银台 2023-11-09 13:51:57 +08:00
DESKTOP-369JRHT\12997
9e2b9068a2 积分 2023-11-08 18:08:54 +08:00
3c1a0c7ca9 收银台 2023-11-08 18:07:17 +08:00
243041ced9 修改优惠券 2023-11-08 17:08:06 +08:00
67e94f78a8 收银台 2023-11-07 18:12:17 +08:00
DESKTOP-369JRHT\12997
96497a7be9 积分订单 2023-11-07 18:04:43 +08:00
630f95dfb0 优惠券 2023-11-07 17:34:56 +08:00
a80d0af65e Merge remote-tracking branch 'origin/master' 2023-11-07 09:04:17 +08:00
d8e82d2bb8 兑换券 2023-11-07 09:04:02 +08:00
17661f6115 收银台 2023-11-06 18:06:29 +08:00