Commit Graph

218 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
273351cb35 收银台 2023-11-17 17:26:12 +08:00
wangh
516f80e57b 收银台 2023-11-17 16:38:17 +08:00
wangh
db19da43e8 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-17 16:37:39 +08:00
wangh
a8898a5140 1 2023-11-17 16:37:33 +08:00
b9b49fcb62 收银台 2023-11-17 16:33:36 +08:00
@QQNZX
22ce14d906 Merge remote-tracking branch 'origin/master' 2023-11-17 15:45:17 +08:00
@QQNZX
a80c862306 11.16 2023-11-17 15:45:07 +08:00
3c90294a21 Merge remote-tracking branch 'origin/master' 2023-11-17 15:40:02 +08:00
435e6feb10 会员等级 2023-11-17 15:39:55 +08:00
@QQNZX
029920dd6d Merge remote-tracking branch 'origin/master' 2023-11-17 15:39:04 +08:00
@QQNZX
e9db6fd020 11.16 2023-11-17 15:38:56 +08:00
1d24fcfee2 Merge remote-tracking branch 'origin/master' 2023-11-17 15:21:48 +08:00
88053d1a20 修改会员等级 2023-11-17 15:21:40 +08:00
@QQNZX
0935f6b5f4 11.16 2023-11-17 15:12:06 +08:00
d184f6cccd 会员等级 2023-11-17 14:55:45 +08:00
@QQNZX
6bb4dd33e1 Merge remote-tracking branch 'origin/master' 2023-11-17 13:10:06 +08:00
@QQNZX
0747a79c6f 11.16 2023-11-17 13:09:47 +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
@QQNZX
859a05407f Merge remote-tracking branch 'origin/master' 2023-11-16 18:39:16 +08:00
@QQNZX
bbc0a08162 11.16 2023-11-16 18:39:06 +08:00
0143eed720 Merge remote-tracking branch 'origin/master' 2023-11-16 18:31:37 +08:00
b9f4fad30f 卡券核销 2023-11-16 18:31:29 +08:00
@QQNZX
dde0c7d4ee 11.16 2023-11-16 17:50:02 +08:00
@QQNZX
f0342e4544 11.16 2023-11-16 10:55:35 +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
@QQNZX
b3e199acb6 11.15 2023-11-15 18:42:06 +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
@QQNZX
6a8849aea4 11.15 2023-11-15 14:33:51 +08:00
@QQNZX
793e5c9e39 11.15 2023-11-15 09:09:34 +08:00
757d9c5adb 收银台 2023-11-14 19:00:25 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
@QQNZX
7ab789ba2a 11.11 2023-11-14 16:08:33 +08:00
6400889d3c 营销活动 2023-11-14 11:27: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