Commit Graph

216 Commits

Author SHA1 Message Date
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
19fc2fdb2b Merge remote-tracking branch 'origin/master' 2023-12-06 18:01:06 +08:00
fbbe572286 优化活动 2023-12-06 18:00:48 +08:00
426cd1ca30 订单信息 2023-12-05 17:18:27 +08:00
wangh
6dd43b9d68 积分详情 2023-12-05 15:16:15 +08:00
wangh
abe9969d75 修改 2023-12-05 13:44:15 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
880bb21ae5 Merge remote-tracking branch 'origin/master' 2023-12-05 09:43:47 +08:00
03a83c5702 油站活动 2023-12-05 09:43:37 +08:00
wangh
4eaafc9bf0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-05 09:24:35 +08:00
wangh
869f189c4d no message 2023-12-05 09:24:31 +08:00
0416cb19d0 会员信息 2023-12-04 16:35:09 +08:00
cf5d5684e0 Merge remote-tracking branch 'origin/master' 2023-12-01 16:48:06 +08:00
eca6f8a9a7 小程序储值卡 2023-12-01 16:47:56 +08:00
ef2ef63234 会员信息 2023-12-01 16:26:25 +08:00
wangh
81749b3388 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-01 15:42:28 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
d48a4cabe7 会员信息 2023-11-30 18:30:46 +08:00
f3461e779b Merge remote-tracking branch 'origin/master' 2023-11-30 17:29:19 +08:00
cb2543531d 小程序端活动02 2023-11-30 17:29:10 +08:00
wangh
ca0c13a07c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-30 14:28:18 +08:00
wangh
eff9fccd2f 封面会员价 2023-11-30 14:28:12 +08:00
41cabe23d1 Merge remote-tracking branch 'origin/master' 2023-11-30 11:57:53 +08:00
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
wangh
ed40ec677e no message 2023-11-30 11:37:32 +08:00
wangh
9ff4038838 登录接口 2023-11-30 11:07:26 +08:00
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
wangh
f45dfbd0de Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/CardManagement/CardManagement.js.map
#	gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/Recharge/Recharge.js.map
#	gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/feedback/feedback.js.map
#	gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/invite/invite.js.map
#	gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/writeOff/writeOff.js.map
2023-11-29 16:50:42 +08:00
wangh
28a26db27c 1 2023-11-29 16:48:44 +08:00
491c8bf426 会员信息 2023-11-29 16:26:19 +08:00
wangh
7073e91a34 1 2023-11-29 14:03:47 +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