Commit Graph

71 Commits

Author SHA1 Message Date
wangh
bb13e3bd35 验证openId 2024-01-26 10:48:51 +08:00
wangh
661fb65605 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 17:33:02 +08:00
wangh
f4f9ec07ff no message 2024-01-24 17:32:57 +08:00
0c151ad2b2 Merge remote-tracking branch 'origin/master' 2024-01-24 15:22:29 +08:00
8215f03ac9 bug 2024-01-24 15:22:16 +08:00
5470356f7e bug 2024-01-24 15:14:48 +08:00
cf631ad033 bug 2024-01-23 18:14:56 +08:00
15ca62967e bug 2024-01-23 16:02:28 +08:00
3a6f73f33e bug 2024-01-23 09:55:23 +08:00
@QQNZX
6dada2c04f Merge remote-tracking branch 'origin/master' 2024-01-23 09:47:04 +08:00
@QQNZX
7aab20e954 前端 2024-01-23 09:46:50 +08:00
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
a43012cda0 bug 2024-01-22 18:05:19 +08:00
43b6dad16d bug 2024-01-22 16:14:28 +08:00
fcb8ddb9ca bug 2024-01-20 11:48:52 +08:00
wangh
662f21012d Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-19 18:32:13 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
@QQNZX
d406fb97a0 前端 2024-01-19 16:07:11 +08:00
944b5bbb87 bug 2024-01-18 15:01:26 +08:00
298977bb25 bug 2024-01-15 18:17:40 +08:00
ea8bab751a bug 2024-01-13 18:01:23 +08:00
a4c4e5fa0a 修改bug 2024-01-12 13:26:50 +08:00
wangh
3054607717 bug修改 2024-01-09 17:09:45 +08:00
wangh
3f857268a6 bug修改 2024-01-09 12:02:40 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
eae119f033 优化项 2024-01-05 18:27:59 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-05 14:30:27 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
@QQNZX
9acd5324d5 前端 2024-01-05 14:02:20 +08:00
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
302c39b3dc Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/pages/index/index.vue
2024-01-04 15:55:48 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
@QQNZX
d79fe5d247 前端 模板的更新 2024-01-04 09:10:33 +08:00
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
wangh
adfb53bac2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintBackend/configure/dev/application.properties
#	fuintBackend/fuint-application/src/main/resources/application.properties
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-02 11:29:51 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
@QQNZX
9974798e58 前端 2024-01-02 10:04:57 +08:00
2bc16929cf 优化项 2023-12-29 18:09:33 +08:00
b5341ed627 首页banner图 2023-12-29 16:50:44 +08:00
a5d998b02d 满减 2023-12-29 15:27:06 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
b9bac4a4b0 小程序支付 2023-12-22 16:33:34 +08:00
cc69c78e3e 小程序端推荐有礼 2023-12-21 17:48:13 +08:00
52379f54d0 加油信息 2023-12-19 18:03:05 +08:00
@QQNZX
a02adf35a6 油站小程序 两个弹窗 2023-12-19 09:31:53 +08:00
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
wangh
29b2f0f586 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2023-12-14 13:40:31 +08:00