Commit Graph

175 Commits

Author SHA1 Message Date
925c8cc402 修改消费有礼bug 2023-11-15 14:34:34 +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
wangh
22aee4bb01 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-13 16:54:24 +08:00
wangh
b080f3e344 前端支付 2023-11-13 16:54:15 +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
@QQNZX
4feda12365 11.11 2023-11-13 10:04:51 +08:00
79134699fd 收银台 2023-11-11 18:04:49 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
@QQNZX
492e53ca49 Merge remote-tracking branch 'origin/master' 2023-11-11 17:54:12 +08:00
@QQNZX
bd14aef39b 11.11 2023-11-11 17:54:03 +08:00
c9c66c61dd 收银台 2023-11-11 13:54:24 +08:00
wangh
3227f9b44b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-11 13:28:09 +08:00
@QQNZX
aab74f80c3 11.11 2023-11-11 10:57:49 +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
a1138b726d 收银台 2023-11-09 13:59:06 +08:00
8ed145b436 收银台 2023-11-09 13:57:48 +08:00
d1e5ca4140 修改优惠券id 2023-11-09 13:53:03 +08:00
04e5fc97be 修改优惠券在线下线默认值 2023-11-09 13:53:02 +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
ec9880272c Merge remote-tracking branch 'origin/master' 2023-11-08 17:08:21 +08:00
243041ced9 修改优惠券 2023-11-08 17:08:06 +08:00
55d4e8631d 11.6 2023-11-08 17:01:44 +08:00
94f072b247 11.6 2023-11-08 16:38:22 +08:00
c1b7ef61b5 11.6 2023-11-08 14:58:40 +08:00
4d28a69c94 Merge remote-tracking branch 'origin/master' 2023-11-08 09:33:29 +08:00
94adf07fa8 优惠券 2023-11-08 09:33:11 +08:00
2c9cbb0bc6 11.6 2023-11-08 09:18:49 +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
673b6ad10a 11.6 2023-11-07 13:31:31 +08:00
8e3d5b15ac Merge remote-tracking branch 'origin/master' 2023-11-07 09:31:57 +08:00
557aba50c7 兑换券 2023-11-07 09:31:13 +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
b9dceb5426 Merge remote-tracking branch 'origin/master' 2023-11-07 09:01:34 +08:00
6d2d22be32 11.6 2023-11-06 18:07:31 +08:00