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

514 Commits

Author SHA1 Message Date
齐天大圣
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