Commit Graph

175 Commits

Author SHA1 Message Date
wangh
cb14e279c2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-30 09:06:13 +08:00
wangh
2fbeeabba2 no message 2023-11-30 09:06:08 +08:00
f920b643aa 会员信息 2023-11-29 18:33:09 +08:00
a77183d47b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
2023-11-29 18:23:52 +08:00
eff58c7a3a 小程序端活动 2023-11-29 18:21:11 +08:00
wangh
c5d44f4d22 no message 2023-11-29 17:41:11 +08:00
wangh
01641bbae2 no message 2023-11-29 17:37:42 +08:00
wangh
dd5df3bc78 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-29 17:19:38 +08:00
wangh
f6413514f6 1 2023-11-29 17:19:32 +08:00
71b21efc27 会员信息 2023-11-29 17:18:28 +08:00
d4b1d72608 会员信息 2023-11-29 16:56:28 +08:00
491c8bf426 会员信息 2023-11-29 16:26:19 +08:00
wangh
b25c52f6de 登录修改 2023-11-29 11:50:58 +08:00
cec9d85b3a 收银台 2023-11-28 18:33:35 +08:00
wangh
195a7298e0 1 2023-11-28 18:10:16 +08:00
37fa476a0f 收银台 2023-11-28 16:40:05 +08:00
996d2ea94c 收银台 2023-11-28 15:42:35 +08:00
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00
wangh
b00edb2f12 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:58 +08:00
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug
修改
2023-11-25 18:08:15 +08:00
ad81a123c6 Merge remote-tracking branch 'origin/master' 2023-11-25 14:42:05 +08:00
492179cb24 修改Bug 2023-11-25 14:41:54 +08:00
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
f706797001 bug修改 2023-11-24 17:59:53 +08:00
87147fbcf3 Merge remote-tracking branch 'origin/master' 2023-11-24 17:24:20 +08:00
92d425f57c 手机验证码登录 2023-11-24 17:24:10 +08:00
wangh
7e8e0fac03 修改 2023-11-24 10:23:59 +08:00
302a7850fe 收银台 2023-11-23 18:37:40 +08:00
wangh
d68f87b29b bug修改 2023-11-23 18:33:25 +08:00
58db28edfb 收银台 2023-11-22 18:10:36 +08:00
wangh
b2574cc2cb 会员等级和进油修改 2023-11-22 18:05:02 +08:00
f6a9d94364 Merge remote-tracking branch 'origin/master' 2023-11-22 13:40:06 +08:00
9da6684bf0 修改Bug 2023-11-22 13:39:57 +08:00
wangh
19f521c406 修改bug 2023-11-22 10:53:41 +08:00
efaf87cb3e Merge remote-tracking branch 'origin/master' 2023-11-22 10:47:32 +08:00
916383fe82 修改Bug 2023-11-22 10:47:20 +08:00
wangh
b51938071a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-21 18:12:04 +08:00
wangh
174bfee9d5 bug修改 2023-11-21 18:11:49 +08:00
92251e2556 Merge remote-tracking branch 'origin/master' 2023-11-21 14:30:06 +08:00
3eec70da9b 修改Bug 2023-11-21 14:29:55 +08:00
92f6691025 收银台 2023-11-21 11:00:14 +08:00
3c916cb22b Merge remote-tracking branch 'origin/master' 2023-11-21 09:45:37 +08:00
4293d06417 兑换优惠券 2023-11-21 09:45:28 +08:00
7ec55c0386 收银台 2023-11-20 19:53:05 +08:00
5568c13c04 收银台 2023-11-20 14:27:22 +08:00
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