|
|
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 |
|
|
|
179f49c58f
|
bug
|
2024-01-22 11:51:12 +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 |
|
|
|
5c4922d656
|
bug
|
2024-01-19 14:54:59 +08:00 |
|
|
|
f467023ba0
|
bug
|
2024-01-19 14:28:32 +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 |
|
|
|
944b5bbb87
|
bug
|
2024-01-18 15:01:26 +08:00 |
|
|
|
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 |
|
|
|
45677555fc
|
bug
|
2024-01-17 16:26:08 +08:00 |
|
|
|
e9dd0600c2
|
bug
|
2024-01-17 14:14:19 +08:00 |
|
|
|
2398ead499
|
bug
|
2024-01-16 11:30:23 +08:00 |
|
|
|
298977bb25
|
bug
|
2024-01-15 18:17:40 +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 |
|
@QQNZX
|
0ec2ff3c91
|
前端
|
2024-01-15 13:36:34 +08:00 |
|
@QQNZX
|
89d2d71152
|
前端
|
2024-01-15 11:39:48 +08:00 |
|
|
|
ea8bab751a
|
bug
|
2024-01-13 18:01:23 +08:00 |
|
wangh
|
bff603b970
|
no message
|
2024-01-13 15:04:45 +08:00 |
|
|
|
18d96bb254
|
Merge remote-tracking branch 'origin/master'
|
2024-01-13 13:50:29 +08:00 |
|
|
|
7d9d150c38
|
修改bug
|
2024-01-13 13:50:18 +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 |
|
|
|
399cf05de6
|
bug
|
2024-01-13 13:13:18 +08:00 |
|
|
|
7a5a1dcddb
|
Merge remote-tracking branch 'origin/master'
|
2024-01-13 10:35:18 +08:00 |
|
|
|
3892bd0e21
|
bug
|
2024-01-13 10:35:03 +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 |
|
|
|
686a0d2e03
|
bug
|
2024-01-12 18:03:02 +08:00 |
|
|
|
f57f77d8ed
|
修改bug
|
2024-01-12 14:41:47 +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 |
|
|
|
4ed6ba6e8c
|
bug
|
2024-01-12 13:55:40 +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 |
|
|
|
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 |
|
|
|
2a81b49f14
|
bug
|
2024-01-11 09:51:50 +08:00 |
|
|
|
a61a99cde7
|
优化项
|
2024-01-10 18:09:46 +08:00 |
|
wangh
|
301be80121
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-01-10 15:44:04 +08:00 |
|
