|
|
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 |
|
|
|
4df95eff14
|
bug
|
2024-01-17 18:17:57 +08:00 |
|
|
|
0111c8055c
|
bug
|
2024-01-17 17:36:21 +08:00 |
|
|
|
45677555fc
|
bug
|
2024-01-17 16:26:08 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
298977bb25
|
bug
|
2024-01-15 18:17:40 +08:00 |
|
|
|
8ca3554f0c
|
bug
|
2024-01-15 16:10:11 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
94b0dacae7
|
bug
|
2024-01-13 11:53:00 +08:00 |
|
|
|
3892bd0e21
|
bug
|
2024-01-13 10:35:03 +08:00 |
|
|
|
686a0d2e03
|
bug
|
2024-01-12 18:03:02 +08:00 |
|
|
|
db6d7f9c85
|
bug
|
2024-01-12 17:03:22 +08:00 |
|
|
|
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 |
|
|
|
4ed6ba6e8c
|
bug
|
2024-01-12 13:55:40 +08:00 |
|
|
|
93ef148515
|
Merge remote-tracking branch 'origin/master'
|
2024-01-12 13:26:52 +08:00 |
|
|
|
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 |
|
|
|
7c512e33aa
|
bug
|
2024-01-11 18:08:12 +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 |
|
|
|
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 |
|
|
|
eaa527e109
|
优化项
|
2024-01-10 13:45:02 +08:00 |
|
|
|
8e2fc95aa9
|
Merge remote-tracking branch 'origin/master'
|
2024-01-10 11:06:57 +08:00 |
|
|
|
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 |
|
|
|
6b6ae15cb1
|
优化项
|
2024-01-09 11:27:55 +08:00 |
|
|
|
418ec4a863
|
优化项
|
2024-01-09 11:26:55 +08:00 |
|
|
|
c3e633ca43
|
优化项
|
2024-01-08 18:26:49 +08:00 |
|
|
|
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 |
|
|
|
6ef091cd6c
|
优化项
|
2024-01-08 09:18:42 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
683b41e456
|
优化项
|
2024-01-06 13:37:21 +08:00 |
|
@QQNZX
|
14f1b6fdd4
|
前端
|
2024-01-06 10:42:41 +08:00 |
|
|
|
0596e7f689
|
优化项
|
2024-01-06 10:02:09 +08:00 |
|
|
|
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 |
|
