Commit Graph

1423 Commits

Author SHA1 Message Date
116141d547 礼品卡兑换记录 2023-12-08 15:15:03 +08:00
ce0c69be7a bug 12.08 2023-12-08 13:33:52 +08:00
4c674b0109 Merge remote-tracking branch 'origin/master' 2023-12-08 13:13:31 +08:00
9d1eb21787 礼品卡兑换 2023-12-08 13:13:21 +08:00
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
68c0ab29e7 Merge remote-tracking branch 'origin/master' 2023-12-07 14:02:10 +08:00
90b80a1290 修改可用优惠券 2023-12-07 14:01:59 +08:00
wangh
b40a9d8efe Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
2023-12-07 10:24:29 +08:00
wangh
08242aff89 no message 2023-12-07 10:23:33 +08:00
wangh
b93f9559de no message 2023-12-07 10:23:14 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
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
@QQNZX
ca009c2619 12.06前端-中台 2023-12-06 11:37:10 +08:00
e70e41434f 订单信息 2023-12-06 10:28:49 +08:00
@QQNZX
899623c5b0 Merge remote-tracking branch 'origin/master' 2023-12-06 09:41:27 +08:00
@QQNZX
3bcbbf5d5d 12.06前端 2023-12-06 09:41:19 +08:00
wangh
32caf8bd60 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
2023-12-06 09:26:53 +08:00
wangh
6ab150b251 no message 2023-12-06 09:25:45 +08:00
@QQNZX
1194f7db5c 12.05前端 2023-12-06 09:20:25 +08:00
426cd1ca30 订单信息 2023-12-05 17:18:27 +08:00
@QQNZX
0ce3aa8b89 12.05前端 2023-12-05 15:49:40 +08:00
@QQNZX
e7d735e93e 12.05前端 2023-12-05 15:43:39 +08:00
wangh
6dd43b9d68 积分详情 2023-12-05 15:16:15 +08:00
@QQNZX
72519e32b8 12.05前端 2023-12-05 14:30:22 +08:00
wangh
abe9969d75 修改 2023-12-05 13:44:15 +08:00
wangh
49529cd230 调整 2023-12-05 13:33:30 +08:00
e56b940fb5 Merge remote-tracking branch 'origin/master' 2023-12-05 12:04:15 +08:00
6e8508cd5b 会员信息 2023-12-05 12:04:03 +08:00
@QQNZX
ec5443d79c Merge remote-tracking branch 'origin/master' 2023-12-05 11:41:51 +08:00
@QQNZX
3e22074fa1 12.05前端 2023-12-05 11:41:42 +08:00
wangh
23275a4d52 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
2023-12-05 11:27:32 +08:00
wangh
81afa52f73 no message 2023-12-05 11:26:48 +08:00
a318f0ca31 Merge remote-tracking branch 'origin/master' 2023-12-05 11:22:02 +08:00
@QQNZX
6a67ef9347 12.05前端 2023-12-05 11:21:21 +08:00
140462a181 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/CardManagement/CardManagement.js
#	gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.js
#	gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/feedback/feedback.js
#	gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/writeOff/writeOff.js
2023-12-05 11:17:43 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
e0816ddbc8 会员信息 2023-12-05 10:47:00 +08:00
a369c89237 会员信息 2023-12-05 10:46:04 +08:00
wangh
f2aa5c9533 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-05 10:39:00 +08:00
wangh
8163e11ded no message 2023-12-05 10:38:56 +08:00
wangh
2937f621fc no message 2023-12-05 10:37:36 +08:00
0c0b542665 12.05 2023-12-05 09:47:33 +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
de13b4e996 会员信息 2023-12-01 17:57:07 +08:00