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

1049 Commits

Author SHA1 Message Date
齐天大圣
6f8c252d2b bug 2024-03-07 17:20:55 +08:00
齐天大圣
417a38f7a5 Merge remote-tracking branch 'origin/master' 2024-03-07 17:03:03 +08:00
齐天大圣
43140c41ab bug 2024-03-07 17:02:51 +08:00
cun-nan
57adb30134 bug 2024-03-07 17:00:09 +08:00
齐天大圣
1531eef136 bug 2024-03-07 16:36:04 +08:00
齐天大圣
fee077d015 Merge remote-tracking branch 'origin/master' 2024-03-07 16:23:45 +08:00
齐天大圣
42f76872b8 bug 2024-03-07 16:23:33 +08:00
cun-nan
2e3575b4de bug 2024-03-07 16:11:59 +08:00
cun-nan
46ec7907a3 bug 2024-03-07 14:53:54 +08:00
齐天大圣
173cac0da9 Merge remote-tracking branch 'origin/master' 2024-03-07 14:31:45 +08:00
齐天大圣
27ccbb65f9 bug 2024-03-07 14:30:57 +08:00
cun-nan
b2dfaa9579 bug 2024-03-07 14:10:07 +08:00
齐天大圣
42afda3a8a Merge remote-tracking branch 'origin/master' 2024-03-07 13:53:19 +08:00
齐天大圣
805738c584 bug 2024-03-07 13:52:15 +08:00
cun-nan
ad80d44ef9 bug 2024-03-07 13:37:12 +08:00
cun-nan
5f6e4186e0 bug 2024-03-07 12:10:12 +08:00
cun-nan
33c27b15a1 bug 2024-03-07 12:03:58 +08:00
cun-nan
78795abc73 bug 2024-03-07 11:47:11 +08:00
齐天大圣
87732aaa2c Merge remote-tracking branch 'origin/master' 2024-03-07 11:37:20 +08:00
齐天大圣
6a976628eb bug 2024-03-07 11:37:10 +08:00
cun-nan
69c0516825 bug 2024-03-07 11:31:53 +08:00
齐天大圣
470fed9d7c bug 2024-03-07 11:23:56 +08:00
cun-nan
5da7530631 bug 2024-03-07 11:14:02 +08:00
cun-nan
d9d69baff5 bug 2024-03-07 11:06:57 +08:00
cun-nan
8fb0f54ce4 bug 2024-03-07 11:01:35 +08:00
齐天大圣
6870bfc061 Merge remote-tracking branch 'origin/master' 2024-03-07 10:44:40 +08:00
齐天大圣
c6d940a8ed bug 2024-03-07 10:44:07 +08:00
cun-nan
a95e05f830 bug 2024-03-07 09:49:31 +08:00
cun-nan
09fd7d1e04 bug 2024-03-07 09:31:51 +08:00
cun-nan
e175eeda8a bug 2024-03-06 17:33:14 +08:00
齐天大圣
1e6585490e Merge remote-tracking branch 'origin/master' 2024-03-06 17:30:41 +08:00
齐天大圣
b50287eaba bug 2024-03-06 17:30:32 +08:00
cun-nan
3429ec8cbb bug 2024-03-06 17:26:37 +08:00
cun-nan
519155c263 bug 2024-03-06 16:45:11 +08:00
cun-nan
56b4579524 bug 2024-03-06 16:25:10 +08:00
齐天大圣
81e69b6e0b bug 2024-03-06 15:55:55 +08:00
齐天大圣
b52fa58a67 bug 2024-03-06 15:37:39 +08:00
齐天大圣
7e35f59abc Merge remote-tracking branch 'origin/master' 2024-03-06 15:00:34 +08:00
齐天大圣
8aab85ecd4 bug 2024-03-06 15:00:19 +08:00
cun-nan
ae83dac42d bug 2024-03-06 14:55:15 +08:00
齐天大圣
e7494cd08e bug 2024-03-06 14:51:30 +08:00
齐天大圣
e73ff9722c Merge remote-tracking branch 'origin/master' 2024-03-06 14:27:54 +08:00
齐天大圣
12c27fa77c bug 2024-03-06 14:27:42 +08:00
cun-nan
f72028b3b9 bug 2024-03-06 14:22:45 +08:00
齐天大圣
c7e78cc1c5 Merge remote-tracking branch 'origin/master' 2024-03-06 11:41:29 +08:00
齐天大圣
98e13da32d bug 2024-03-06 11:41:18 +08:00
cun-nan
cddb9231a5 bug 2024-03-06 11:28:57 +08:00
齐天大圣
f9be9ea02d bug 2024-03-06 10:04:25 +08:00
齐天大圣
595227b921 bug 2024-03-06 09:14:48 +08:00
wangh
e745341b4a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-03-05 16:59:54 +08:00
wangh
8ab4844445 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-03-05 16:59:22 +08:00
齐天大圣
5c0172fa32 bug 2024-03-05 16:58:28 +08:00
wangh
2e55066c72 no message 2024-03-05 16:42:59 +08:00
齐天大圣
d0707345f5 Merge remote-tracking branch 'origin/master' 2024-03-05 15:55:58 +08:00
齐天大圣
9e1da10fc5 bug 2024-03-05 15:55:51 +08:00
cun-nan
83b16a32e3 bug 2024-03-05 15:44:43 +08:00
cun-nan
4b1ee8a19f bug 2024-03-05 14:16:43 +08:00
齐天大圣
3a535078bd Merge remote-tracking branch 'origin/master' 2024-03-05 11:22:57 +08:00
齐天大圣
3eab5df6b6 bug 2024-03-05 11:22:51 +08:00
cun-nan
c09a30d546 bug 2024-03-05 09:54:51 +08:00
齐天大圣
66edef025b Merge remote-tracking branch 'origin/master' 2024-03-05 09:20:17 +08:00
齐天大圣
3492885ff2 bug 2024-03-05 09:20:04 +08:00
cun-nan
ed7b346706 bug 2024-03-05 09:11:51 +08:00
wangh
0264b284a3 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-03-04 16:48:14 +08:00
wangh
a504720e4c no message 2024-03-04 16:47:16 +08:00
齐天大圣
e8c9112aa8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-03-04 15:57:11 +08:00
齐天大圣
da011b4860 一键发券 2024-03-04 15:56:33 +08:00
cun-nan
6e2e6830ed bug 2024-03-04 14:25:20 +08:00
齐天大圣
2acc8efe2c Merge remote-tracking branch 'origin/master' 2024-03-04 13:37:46 +08:00
齐天大圣
d96d1f1e53 一键发券 2024-03-04 13:37:29 +08:00
wangh
873cf444e8 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
 2024-03-04 09:58:10 +08:00
wangh
509fa7aa3b no message 2024-03-04 09:53:32 +08:00
cun-nan
2552723bfd bug 2024-03-02 17:58:59 +08:00
cun-nan
9d869e404f bug 2024-03-02 16:41:18 +08:00
cun-nan
24818cb60e bug 2024-03-01 17:55:13 +08:00
齐天大圣
ec24649985 Merge remote-tracking branch 'origin/master' 2024-03-01 15:40:30 +08:00
齐天大圣
72323b9019 推荐有礼 2024-03-01 15:40:23 +08:00
cun-nan
55e449a45d bug 2024-03-01 15:38:46 +08:00
齐天大圣
1177caac17 推荐有礼 2024-03-01 15:11:10 +08:00
齐天大圣
72449acbb7 推荐有礼 2024-03-01 15:07:56 +08:00
齐天大圣
a16552120f Merge remote-tracking branch 'origin/master' 2024-03-01 14:16:58 +08:00
齐天大圣
223a1908f3 推荐有礼 2024-03-01 14:16:48 +08:00
cun-nan
c71ddb7e82 bug 2024-02-29 18:06:34 +08:00
wangh
46282a3edb Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-29 17:02:13 +08:00
wangh
5d22a35b1b no message 2024-02-29 17:02:07 +08:00
cun-nan
c79e5b3e9a bug 2024-02-28 18:02:53 +08:00
齐天大圣
1fe8922e14 推荐有礼 2024-02-28 17:06:16 +08:00
齐天大圣
cc3441506b Merge remote-tracking branch 'origin/master' 2024-02-28 16:45:14 +08:00
齐天大圣
a913357d69 推荐有礼 2024-02-28 16:45:03 +08:00
wangh
2a6abf3b57 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-28 13:25:00 +08:00
wangh
d570586be5 no message 2024-02-28 13:24:53 +08:00
cun-nan
101ef539c3 bug 2024-02-27 17:59:16 +08:00
wangh
570f8c9c0f no message 2024-02-27 15:32:58 +08:00
wangh
00386746aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-27 14:03:52 +08:00
wangh
50cd7a5a34 no message 2024-02-27 14:03:47 +08:00
齐天大圣
9126fc46aa Merge remote-tracking branch 'origin/master' 2024-02-27 13:39:25 +08:00
齐天大圣
3760ab43ca 推荐有礼 2024-02-27 13:39:14 +08:00
cun-nan
e47d92d168 bug 2024-02-26 19:27:54 +08:00
wangh
a11a04be18 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
 2024-02-26 15:09:55 +08:00
wangh
71ad3c3085 bug处理 2024-02-26 15:08:32 +08:00
cun-nan
a69b4d806e bug 2024-02-26 15:05:21 +08:00
cun-nan
7bda79899f bug 2024-02-26 10:12:19 +08:00
cun-nan
4af99bb62e bug 2024-02-23 18:00:16 +08:00
齐天大圣
922cfcb017 Merge remote-tracking branch 'origin/master' 2024-02-23 17:37:34 +08:00
齐天大圣
50acf879a1 推荐有礼 2024-02-23 17:37:20 +08:00
cun-nan
08d2140ca7 bug 2024-02-22 17:53:41 +08:00
cun-nan
76e1a578ba bug 2024-02-21 17:59:58 +08:00
齐天大圣
1c844fd619 Merge remote-tracking branch 'origin/master' 2024-02-21 17:34:42 +08:00
齐天大圣
535d727d14 卡管理 2024-02-21 17:34:35 +08:00
cun-nan
702dceb375 bug 2024-02-21 17:02:13 +08:00
齐天大圣
b2c94c9014 Merge remote-tracking branch 'origin/master' 2024-02-21 15:23:35 +08:00
齐天大圣
06d70a77f1 卡管理 2024-02-21 15:23:19 +08:00
cun-nan
bf998c65b6 bug 2024-02-20 17:52:09 +08:00
cun-nan
857f954c2c bug 2024-02-20 13:33:34 +08:00
cun-nan
26555b9dbc bug 2024-02-20 11:00:47 +08:00
wangh
6830a50945 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-20 10:58:42 +08:00
wangh
e804dff7d5 退款 2024-02-20 10:58:23 +08:00
cun-nan
3b64908eb7 bug 2024-02-20 10:54:06 +08:00
cun-nan
87b4f3595b bug 2024-02-19 18:06:02 +08:00
wangh
a0629a80fa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-19 16:38:08 +08:00
wangh
6f6988b8b2 no message 2024-02-19 16:38:03 +08:00
cun-nan
b137edcac0 bug 2024-02-19 16:03:34 +08:00
cun-nan
9b11659153 bug 2024-02-18 18:09:52 +08:00
wangh
e5a24d3c83 no message 2024-02-07 17:29:50 +08:00
wangh
ad7f7356c7 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-07 11:07:07 +08:00
wangh
dd08ddd5f1 no message 2024-02-07 11:07:03 +08:00
cun-nan
1ff31e1338 bug 2024-02-06 18:10:15 +08:00
cun-nan
3c6defd2c6 bug 2024-02-06 16:48:14 +08:00
cun-nan
fd0091634f bug 2024-02-06 16:35:34 +08:00
wangh
bca15b8ae5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-06 15:48:31 +08:00
wangh
7e48ac59dd no message 2024-02-06 15:48:25 +08:00
cun-nan
bfef076269 bug 2024-02-06 11:38:42 +08:00
@QQNZX
33575a8e95 前端 2024-02-06 09:10:18 +08:00
cun-nan
7c538e5aab bug 2024-02-05 18:09:05 +08:00
齐天大圣
96eaddcd7c Merge remote-tracking branch 'origin/master' 2024-02-05 18:00:50 +08:00
齐天大圣
1e9cdce8c3 一键发券 2024-02-05 18:00:37 +08:00
wangh
614387248f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-05 17:35:47 +08:00
wangh
a32a779fe0 no message 2024-02-05 17:35:38 +08:00
cun-nan
9f5d333798 bug 2024-02-04 18:08:43 +08:00
cun-nan
033a66f12d bug 2024-02-04 13:37:04 +08:00
cun-nan
b1b8797ad0 bug 2024-02-03 17:37:34 +08:00
wangh
d05c5d8efb 油品盘点 2024-02-03 15:28:56 +08:00
wangh
39aadfc467 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-03 13:49:14 +08:00
wangh
d3f414111f no message 2024-02-03 13:49:10 +08:00
cun-nan
e38c87edaf bug 2024-02-03 13:47:34 +08:00
cun-nan
206f171544 bug 2024-02-02 18:02:17 +08:00
cun-nan
974fd2be7c bug 2024-02-02 14:18:16 +08:00
wangh
6c39c09d98 no message 2024-02-02 09:04:04 +08:00
cun-nan
3bf7dc3b70 bug 2024-02-01 17:52:17 +08:00
齐天大圣
32959d1641 Merge remote-tracking branch 'origin/master' 2024-02-01 15:54:09 +08:00
齐天大圣
7e11f77a6e 一键发券 2024-02-01 15:53:54 +08:00
wangh
c997873f10 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/details/index.vue
 2024-02-01 11:33:33 +08:00
wangh
d789b8b85a bug修改 2024-02-01 11:31:55 +08:00
cun-nan
273e38494c bug 2024-02-01 10:03:16 +08:00
cun-nan
79d073b26c bug 2024-01-31 18:41:47 +08:00
cun-nan
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
cun-nan
788fba4dae bug 2024-01-30 19:40:58 +08:00
cun-nan
63ca5ca01b bug 2024-01-30 18:36:40 +08:00
cun-nan
79c152ca76 bug 2024-01-30 16:04:49 +08:00
wangh
8b907e9ad0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintAdmin_zt/.env.development
 2024-01-30 09:57:21 +08:00
wangh
189f6dff68 no message 2024-01-30 09:56:03 +08:00
wangh
c1d80d6e15 no message 2024-01-30 09:55:14 +08:00
cun-nan
cedf3c7281 bug 2024-01-29 18:18:30 +08:00
齐天大圣
f09179d247 一键发券 2024-01-29 14:39:09 +08:00
齐天大圣
e6defacb58 Merge remote-tracking branch 'origin/master' 2024-01-29 14:36:07 +08:00
齐天大圣
9ce51786d6 一键发券 2024-01-29 14:35:59 +08:00
cun-nan
d7d8256135 bug 2024-01-29 14:26:14 +08:00
wangh
58e5f81d8b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-29 14:23:44 +08:00
wangh
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
齐天大圣
425f20f080 Merge remote-tracking branch 'origin/master' 2024-01-29 14:11:10 +08:00
齐天大圣
acf41325ef 一键发券 2024-01-29 14:11:02 +08:00
cun-nan
237466ee75 bug 2024-01-29 11:51:24 +08:00
齐天大圣
f325084e07 一键发券 2024-01-29 10:42:15 +08:00
cun-nan
60ccc78c46 bug 2024-01-29 09:50:28 +08:00
N
285616700b bug 2024-01-28 18:55:43 +08:00
cun-nan
0e40832516 bug 2024-01-27 17:58:07 +08:00
wangh
c4cad9159b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-27 17:51:28 +08:00
wangh
f56fab7e9d bug处理 2024-01-27 17:51:20 +08:00
齐天大圣
8dadfa05c3 Merge remote-tracking branch 'origin/master' 2024-01-27 15:45:27 +08:00
齐天大圣
d42435fe24 领券bug 2024-01-27 15:45:10 +08:00
cun-nan
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
齐天大圣
9d96f86dd6 Merge remote-tracking branch 'origin/master' 2024-01-27 13:56:05 +08:00
齐天大圣
39bcd86010 领券bug 2024-01-27 13:55:55 +08:00
cun-nan
de750590f1 bug 2024-01-27 11:35:35 +08:00
cun-nan
32cb50848f bug 2024-01-27 10:51:32 +08:00
齐天大圣
cbb0d2b9ae Merge remote-tracking branch 'origin/master' 2024-01-27 10:09:11 +08:00
齐天大圣
ba1a17ff85 领券bug 2024-01-27 10:08:26 +08:00
cun-nan
249b30da4d bug 2024-01-27 09:05:50 +08:00
wangh
a89ca421cd Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-26 16:57:35 +08:00
wangh
50dcb6898c 验证码登录 2024-01-26 16:57:27 +08:00
cun-nan
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
wangh
84091da9d5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-26 10:49:06 +08:00
wangh
bb13e3bd35 验证openId 2024-01-26 10:48:51 +08:00
cun-nan
d54ef244a8 bug 2024-01-25 18:27:19 +08:00
wangh
3d3ea7ba06 no message 2024-01-25 16:48:08 +08:00
齐天大圣
4f071179af 领券bug 2024-01-25 16:20:17 +08:00
cun-nan
0fe4d0d202 bug 2024-01-25 15:49:18 +08:00
齐天大圣
96af32a2dd Merge remote-tracking branch 'origin/master' 2024-01-25 15:42:24 +08:00
齐天大圣
cb282e356b 领券bug 2024-01-25 15:42:16 +08:00
cun-nan
fced742168 bug 2024-01-25 13:19:17 +08:00
wangh
0760093344 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-25 10:25:02 +08:00
wangh
a09d3208af no message 2024-01-25 10:24:55 +08:00
cun-nan
6976d3e7ce bug 2024-01-25 10:13:43 +08:00
齐天大圣
db25cf1b23 Merge remote-tracking branch 'origin/master' 2024-01-24 17:39:06 +08:00
齐天大圣
5cad54a5d0 领券bug 2024-01-24 17:38:57 +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
wangh
e423293f5c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 15:07:35 +08:00
wangh
13af4ffd80 打印 2024-01-24 15:07:26 +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
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
b1dedd5764 bug 2024-01-23 14:16:17 +08:00
齐天大圣
53627e2f41 bug 2024-01-23 11:41:01 +08:00
齐天大圣
2e193072eb bug 2024-01-23 11:21:20 +08:00
齐天大圣
b6a7befa56 Merge remote-tracking branch 'origin/master' 2024-01-23 10:56:52 +08:00
齐天大圣
56892e22bf bug 2024-01-23 10:56:44 +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
cun-nan
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
cun-nan
a43012cda0 bug 2024-01-22 18:05:19 +08:00
齐天大圣
0d16fe2c8d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
 2024-01-22 14:26:39 +08:00
齐天大圣
f16d31ca40 bug 2024-01-22 14:26:01 +08:00
cun-nan
cadb4ce475 bug 2024-01-22 14:25:45 +08:00
cun-nan
8e893ae4d4 bug 2024-01-22 13:29:42 +08:00
cun-nan
179f49c58f bug 2024-01-22 11:51:12 +08:00
cun-nan
63ec546d5c bug 2024-01-22 10:32:13 +08:00
cun-nan
196d7f41ad bug 2024-01-22 10:09:43 +08:00
cun-nan
1d09b0b4c2 bug 2024-01-22 09:22:50 +08:00
齐天大圣
32c78a40e0 bug 2024-01-22 09:05:18 +08:00
齐天大圣
be13af873d 本站活动 2024-01-20 18:20:09 +08:00
cun-nan
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
齐天大圣
83a0e8367a 本站活动 2024-01-20 13:55:05 +08:00
齐天大圣
ba181d2ce7 Merge remote-tracking branch 'origin/master' 2024-01-20 12:01:21 +08:00
齐天大圣
acc85b1fa6 111 2024-01-20 12:01:11 +08:00
cun-nan
fcb8ddb9ca bug 2024-01-20 11:48:52 +08:00
齐天大圣
3cc44f8272 111 2024-01-20 11:14:29 +08:00
齐天大圣
3df54fd625 Merge remote-tracking branch 'origin/master' 2024-01-20 10:44:46 +08:00
齐天大圣
397108077b 111 2024-01-20 10:44:36 +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
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
齐天大圣
6c1257e605 111 2024-01-19 18:18:27 +08:00
齐天大圣
4dc2c4d5ca 满减折扣活动记录 2024-01-19 17:36:51 +08:00
齐天大圣
974264984f bug 2024-01-19 16:02:17 +08:00
齐天大圣
6a7af98bec bug 2024-01-19 15:36:45 +08:00
cun-nan
5c4922d656 bug 2024-01-19 14:54:59 +08:00
齐天大圣
62da5301d3 Merge remote-tracking branch 'origin/master' 2024-01-19 14:28:40 +08:00
齐天大圣
f467023ba0 bug 2024-01-19 14:28:32 +08:00
cun-nan
8d249e7e5e bug 2024-01-19 13:44:13 +08:00
cun-nan
bd213aa77b bug 2024-01-19 13:08:30 +08:00
齐天大圣
3ef9ad404b bug 2024-01-19 11:33:51 +08:00
齐天大圣
3cc355b4b9 Merge remote-tracking branch 'origin/master' 2024-01-19 11:04:55 +08:00
齐天大圣
3411d1d78e bug 2024-01-19 11:04:41 +08:00
cun-nan
9160829356 bug 2024-01-19 10:43:11 +08:00
齐天大圣
f5805e7659 Merge remote-tracking branch 'origin/master' 2024-01-19 10:28:03 +08:00
齐天大圣
1774597789 bug 2024-01-19 10:27:49 +08:00
wangh
93d27e996e Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-19 10:15:57 +08:00
wangh
130f002dd1 商户号退款 2024-01-19 10:15:32 +08:00
齐天大圣
de97c7d2fd Merge remote-tracking branch 'origin/master' 2024-01-19 09:51:16 +08:00
齐天大圣
0041201480 bug 2024-01-19 09:51:07 +08:00
cun-nan
1c806f5c4d bug 2024-01-18 18:15:24 +08:00
齐天大圣
98ff3486a8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
 2024-01-18 18:07:27 +08:00
齐天大圣
9a96d26d8d 付款 活动最佳优惠接口 2024-01-18 18:06:38 +08:00
wangh
0fe66f0d65 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-18 18:06:12 +08:00
wangh
66910b4bf4 bug处理 2024-01-18 18:06:07 +08:00
cun-nan
ab81e62477 bug 2024-01-18 15:09:51 +08:00
cun-nan
944b5bbb87 bug 2024-01-18 15:01:26 +08:00
cun-nan
d8023ecfba bug 2024-01-18 10:56:43 +08:00
wangh
46913be03f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
 2024-01-18 09:03:42 +08:00
wangh
5c65399290 退款以及订单统计 2024-01-18 09:01:26 +08:00
cun-nan
4df95eff14 bug 2024-01-17 18:17:57 +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
wangh
0cf119bfab Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 16:10:34 +08:00
wangh
82a739ce75 退款处理 2024-01-16 16:10:28 +08:00
齐天大圣
b840bd3e99 过滤商品券 2024-01-16 16:08:41 +08:00
cun-nan
c52b006879 bug 2024-01-16 14:28:20 +08:00
齐天大圣
cac79ebfa9 过滤商品券 2024-01-16 13:30:16 +08:00
齐天大圣
19f9249252 Merge remote-tracking branch 'origin/master' 2024-01-16 13:24:29 +08:00
齐天大圣
4637b6a64c 过滤商品券 2024-01-16 13:24:22 +08:00
cun-nan
2398ead499 bug 2024-01-16 11:30:23 +08:00
wangh
6e16f6ac5d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 09:38:22 +08:00
wangh
7768b2faf3 退款接口 2024-01-16 09:38:15 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
cun-nan
8ca3554f0c bug 2024-01-15 16:10:11 +08:00
cun-nan
44f040f6ae bug 2024-01-15 14:41:36 +08:00
齐天大圣
c971b639eb Merge remote-tracking branch 'origin/master' 2024-01-15 14:02:56 +08:00
齐天大圣
078a770a83 囤油余额 2024-01-15 14:02:48 +08:00
cun-nan
3f243f5c63 bug 2024-01-15 14:00:24 +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
a92a25fb28 bug 2024-01-15 13:41:32 +08:00
齐天大圣
70e988e9a8 修改bug3 2024-01-15 11:12:07 +08:00
齐天大圣
a639f4c71e 修改bug2 2024-01-15 10:26:12 +08:00
齐天大圣
d3f85f2878 Merge remote-tracking branch 'origin/master' 2024-01-15 10:08:04 +08:00
齐天大圣
13bf3ba524 修改bug1 2024-01-15 10:07:54 +08:00
cun-nan
ea8bab751a bug 2024-01-13 18:01:23 +08:00
齐天大圣
8889a06565 修改bug 2024-01-13 16:34:22 +08:00
齐天大圣
4a5dcf2c61 Merge remote-tracking branch 'origin/master' 2024-01-13 15:46:36 +08:00
齐天大圣
0353336baf 修改bug 2024-01-13 15:46:28 +08:00
wangh
eb6f43a713 no message 2024-01-13 15:11:46 +08:00
wangh
99571f64ad Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 15:04:49 +08:00
wangh
bff603b970 no message 2024-01-13 15:04:45 +08:00
cun-nan
87f9377e74 bug 2024-01-13 14:21:09 +08:00
wangh
be4970aa7a no message 2024-01-13 14:03:54 +08:00
wangh
0ed07ccd49 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 13:24:02 +08:00
齐天大圣
77df396e46 Merge remote-tracking branch 'origin/master' 2024-01-13 13:22:42 +08:00
齐天大圣
0163084c13 修改bug 2024-01-13 13:22:33 +08:00
wangh
5d9de0a0dc bug修改 2024-01-13 13:22:10 +08:00
cun-nan
94b0dacae7 bug 2024-01-13 11:53:00 +08:00
cun-nan
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
cun-nan
686a0d2e03 bug 2024-01-12 18:03:02 +08:00
cun-nan
db6d7f9c85 bug 2024-01-12 17:03:22 +08:00
cun-nan
288de2b8ba bug 2024-01-12 15:29:24 +08:00
齐天大圣
822965d482 Merge remote-tracking branch 'origin/master' 2024-01-12 14:37:49 +08:00
齐天大圣
95854beff1 修改bug 2024-01-12 14:37:40 +08:00
wangh
250f000040 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-12 13:58:57 +08:00
wangh
dde91a7108 中台增加订单 2024-01-12 13:58:51 +08:00
cun-nan
4ed6ba6e8c bug 2024-01-12 13:55:40 +08:00
cun-nan
93ef148515 Merge remote-tracking branch 'origin/master' 2024-01-12 13:26:52 +08:00
cun-nan
654d912ef1 bug 2024-01-12 13:26:22 +08:00
齐天大圣
8537041269 Merge remote-tracking branch 'origin/master' 2024-01-12 12:05:55 +08:00
齐天大圣
b5d5f6b1eb 修改bug 2024-01-12 12:05:42 +08:00
cun-nan
7c512e33aa bug 2024-01-11 18:08:12 +08:00
cun-nan
2a9b7cae2e bug 2024-01-11 13:55:20 +08:00
wangh
a6cc143bed Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-11 13:34:49 +08:00
wangh
d518ecd277 pc端会员充值修改 2024-01-11 13:34:42 +08:00
cun-nan
2a81b49f14 bug 2024-01-11 09:51:50 +08:00
cun-nan
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
齐天大圣
087b4ded03 修改bug 2024-01-10 16:17:20 +08:00
齐天大圣
e980d52dee 修改bug 2024-01-10 16:07:07 +08:00
wangh
301be80121 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-10 15:44:04 +08:00
wangh
48ce157316 bug 2024-01-10 15:43:57 +08:00
齐天大圣
075427613d 修改bug 2024-01-10 15:30:04 +08:00
齐天大圣
62635c72c2 修改bug 2024-01-10 14:34:55 +08:00
齐天大圣
c54a35084f Merge remote-tracking branch 'origin/master' 2024-01-10 13:54:55 +08:00
齐天大圣
ce2f96006b 修改bug 2024-01-10 13:54:45 +08:00
wangh
8c857bebe3 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-10 13:46:35 +08:00
wangh
1a5bb54d36 修改中台用户管理增加和修改的bug 2024-01-10 13:46:27 +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
6b6ae15cb1 优化项 2024-01-09 11:27:55 +08:00
cun-nan
418ec4a863 优化项 2024-01-09 11:26:55 +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
6ef091cd6c 优化项 2024-01-08 09:18:42 +08:00
cun-nan
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
wangh
ca91fa5b5a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-06 15:51:55 +08:00
wangh
a345536e57 no message 2024-01-06 15:51:41 +08:00
cun-nan
5979294f18 优化项 2024-01-06 15:47:07 +08:00
wangh
214ab014ec Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
 2024-01-06 15:13:27 +08:00
wangh
e267ba63fe bug修改 2024-01-06 15:06:58 +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
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +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
齐天大圣
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
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
齐天大圣
2deb719e4b 修改bug 2024-01-05 14:02:58 +08:00
齐天大圣
18eaab3435 Merge remote-tracking branch 'origin/master' 2024-01-05 09:20:23 +08:00
齐天大圣
bf724adf18 修改bug 2024-01-05 09:20:12 +08:00
cun-nan
cf1c679d19 优化项 2024-01-05 09:17:23 +08:00
cun-nan
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
齐天大圣
8792a11183 修改bug 2024-01-04 15:01:20 +08:00
齐天大圣
2cb89c7776 修改bug 2024-01-04 14:00:45 +08:00
齐天大圣
d1566ef1ce 修改bug 2024-01-04 13:32:09 +08:00
齐天大圣
d6df89b3aa Merge remote-tracking branch 'origin/master' 2024-01-04 12:05:09 +08:00
齐天大圣
5b1c86be9b 修改bug 2024-01-04 12:04:59 +08:00
wangh
6bf929b433 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-04 09:10:15 +08:00
wangh
61d8947fd1 bug修改 2024-01-04 09:09:58 +08:00
齐天大圣
876c391ef8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-01-03 18:46:31 +08:00
齐天大圣
4fa7be30bd 修改bug 2024-01-03 18:45:35 +08:00
cun-nan
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
齐天大圣
93e3d51e5b 修改bug 2024-01-03 16:02:45 +08:00
齐天大圣
a529c7e67e 修改bug 2024-01-03 15:43:34 +08:00
齐天大圣
99767393bc 修改bug 2024-01-03 13:39:21 +08:00
齐天大圣
a897807c16 修改bug 2024-01-03 10:54:36 +08:00