dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,020 Commits 2 Branches 0 Tags 190 MiB
d20c7f151d
Commit Graph

371 Commits

Author SHA1 Message Date
wangh
bb13e3bd35 验证openId 2024-01-26 10:48:51 +08:00
齐天大圣
b36bd2c463 领券bug 2024-01-25 16:43:19 +08:00
齐天大圣
561542338c 领券bug 2024-01-25 15:55:45 +08:00
cun-nan
fced742168 bug 2024-01-25 13:19:17 +08:00
cun-nan
cd43e4f48a bug 2024-01-24 18:11:58 +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
cun-nan
803e28bdcd bug 2024-01-24 17:10:37 +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
cun-nan
5470356f7e bug 2024-01-24 15:14:48 +08:00
cun-nan
819624e4e8 bug 2024-01-24 14:35:00 +08:00
cun-nan
cf631ad033 bug 2024-01-23 18:14:56 +08:00
cun-nan
15ca62967e bug 2024-01-23 16:02:28 +08:00
wangh
3646bc94b9 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-23 14:19:42 +08:00
wangh
5aa43002fd 打印处理 2024-01-23 14:19:35 +08:00
cun-nan
c2ceb9e13b Merge remote-tracking branch 'origin/master' 2024-01-23 10:45:30 +08:00
齐天大圣
937fcee22f Merge remote-tracking branch 'origin/master' 2024-01-23 10:42:20 +08:00
齐天大圣
49ac39e908 bug 2024-01-23 10:42:12 +08:00
cun-nan
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
cun-nan
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
cun-nan
a43012cda0 bug 2024-01-22 18:05:19 +08:00
cun-nan
43b6dad16d bug 2024-01-22 16:14:28 +08:00
cun-nan
cadb4ce475 bug 2024-01-22 14:25:45 +08:00
cun-nan
b2c17babe9 bug 2024-01-22 09:08:20 +08:00
cun-nan
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
cun-nan
fcb8ddb9ca bug 2024-01-20 11:48:52 +08:00
cun-nan
06fcb5fe98 bug 2024-01-19 18:48:13 +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
e5ab331e71 no message 2024-01-19 18:29:07 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
@QQNZX
87b369c62b 前端 2024-01-19 17:08:34 +08:00
@QQNZX
060236f6ce 前端 2024-01-19 16:18:40 +08:00
@QQNZX
f39a17efae Merge remote-tracking branch 'origin/master' 2024-01-19 16:07:23 +08:00
@QQNZX
d406fb97a0 前端 2024-01-19 16:07:11 +08:00
cun-nan
5c4922d656 bug 2024-01-19 14:54:59 +08:00
cun-nan
8d249e7e5e bug 2024-01-19 13:44:13 +08:00
cun-nan
1c806f5c4d bug 2024-01-18 18:15:24 +08:00
cun-nan
944b5bbb87 bug 2024-01-18 15:01:26 +08:00
cun-nan
0111c8055c bug 2024-01-17 17:36:21 +08:00
cun-nan
45677555fc bug 2024-01-17 16:26:08 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
cun-nan
1321922b30 bug 2024-01-16 16:10:03 +08:00
cun-nan
d410b2e215 bug 2024-01-16 09:14:15 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
cun-nan
44f040f6ae bug 2024-01-15 14:41:36 +08:00
wangh
a3c31a8d59 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-15 13:43:41 +08:00
wangh
7a4f1a8ce5 no message 2024-01-15 13:42:37 +08:00
@QQNZX
0ec2ff3c91 前端 2024-01-15 13:36:34 +08:00
@QQNZX
89d2d71152 前端 2024-01-15 11:39:48 +08:00
cun-nan
ea8bab751a bug 2024-01-13 18:01:23 +08:00
齐天大圣
8889a06565 修改bug 2024-01-13 16:34:22 +08:00
齐天大圣
0353336baf 修改bug 2024-01-13 15:46:28 +08:00
齐天大圣
3ee4bd0073 Merge remote-tracking branch 'origin/master' 2024-01-13 09:49:54 +08:00
齐天大圣
7de4b95679 修改bug 2024-01-13 09:49:42 +08:00
@QQNZX
0d653b93e3 前端 2024-01-12 14:47:14 +08:00
cun-nan
4ed6ba6e8c bug 2024-01-12 13:55:40 +08:00
齐天大圣
a4c4e5fa0a 修改bug 2024-01-12 13:26:50 +08:00
cun-nan
2a9b7cae2e bug 2024-01-11 13:55:20 +08:00
cun-nan
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
cun-nan
6ee781c488 Merge remote-tracking branch 'origin/master' 2024-01-10 15:40:30 +08:00
cun-nan
21f5b6884a 优化项 2024-01-10 15:40:22 +08:00
齐天大圣
075427613d 修改bug 2024-01-10 15:30:04 +08:00
cun-nan
eaa527e109 优化项 2024-01-10 13:45:02 +08:00
cun-nan
8e2fc95aa9 Merge remote-tracking branch 'origin/master' 2024-01-10 11:06:57 +08:00
cun-nan
c076b07a83 优化项 2024-01-10 11:06:41 +08:00
wangh
289b04f406 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-09 17:09:51 +08:00
wangh
3054607717 bug修改 2024-01-09 17:09:45 +08:00
齐天大圣
93336c532f Merge remote-tracking branch 'origin/master' 2024-01-09 16:12:30 +08:00
齐天大圣
afb7203e88 修改bug 2024-01-09 16:12:17 +08:00
wangh
bbded088aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
 2024-01-09 13:19:59 +08:00
wangh
3f857268a6 bug修改 2024-01-09 12:02:40 +08:00
cun-nan
c3e633ca43 优化项 2024-01-08 18:26:49 +08:00
cun-nan
431947960b 优化项 2024-01-08 14:45:36 +08:00
wangh
a3ed2f8b2d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-08 10:07:57 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
cun-nan
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
cun-nan
5979294f18 优化项 2024-01-06 15:47:07 +08:00
cun-nan
683b41e456 优化项 2024-01-06 13:37:21 +08:00
@QQNZX
14f1b6fdd4 前端 2024-01-06 10:42:41 +08:00
cun-nan
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
齐天大圣
681381d60b Merge remote-tracking branch 'origin/master' 2024-01-06 09:11:50 +08:00
齐天大圣
92168b1da6 新人有礼活动页 2024-01-06 09:11:41 +08:00
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +08:00
齐天大圣
8dd3c0150d 修改bug 2024-01-05 18:21:15 +08:00
齐天大圣
13a435eb17 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
 2024-01-05 18:20:49 +08:00
齐天大圣
d92c33373a 修改bug 2024-01-05 18:19:48 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
齐天大圣
e740b59800 修改bug 2024-01-05 15:12:40 +08:00
齐天大圣
85dbca19b3 Merge remote-tracking branch 'origin/master' 2024-01-05 15:12:01 +08:00
齐天大圣
2b6d0a3a73 修改bug 2024-01-05 15:11:53 +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
fbd4a9b992 no message 2024-01-05 14:28:00 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
齐天大圣
c671650574 修改bug 2024-01-05 14:24:09 +08:00
齐天大圣
af1f84f917 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/pagesMy/invite/invite.vue
 2024-01-05 14:06:38 +08:00
齐天大圣
f85e1351ef 修改bug 2024-01-05 14:03:31 +08:00
@QQNZX
9acd5324d5 前端 2024-01-05 14:02:20 +08:00