|
|
c09a30d546
|
bug
|
2024-03-05 09:54:51 +08:00 |
|
|
|
ed7b346706
|
bug
|
2024-03-05 09:11:51 +08:00 |
|
@QQNZX
|
4237f313e8
|
前端
|
2024-03-04 18:52:33 +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 |
|
@QQNZX
|
c0e249fc9d
|
Merge remote-tracking branch 'origin/master'
|
2024-03-04 15:55:14 +08:00 |
|
@QQNZX
|
31d8d1ff19
|
前端
|
2024-03-04 15:54:56 +08:00 |
|
|
|
6e2e6830ed
|
bug
|
2024-03-04 14:25:20 +08:00 |
|
|
|
2552723bfd
|
bug
|
2024-03-02 17:58:59 +08:00 |
|
|
|
9d869e404f
|
bug
|
2024-03-02 16:41:18 +08:00 |
|
@QQNZX
|
8db3256bb5
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 18:00:20 +08:00 |
|
@QQNZX
|
f1b2f11ca0
|
前端
|
2024-03-01 17:57:08 +08:00 |
|
|
|
24818cb60e
|
bug
|
2024-03-01 17:55:13 +08:00 |
|
|
|
55e449a45d
|
bug
|
2024-03-01 15:38:46 +08:00 |
|
@QQNZX
|
8da5808d17
|
前端
|
2024-03-01 14:56:38 +08:00 |
|
@QQNZX
|
18ea4f2a6c
|
前端
|
2024-03-01 11:01:36 +08:00 |
|
@QQNZX
|
8c75f4bac6
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 09:35:45 +08:00 |
|
@QQNZX
|
7e1bdf8818
|
前端
|
2024-03-01 09:35:23 +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 |
|
|
|
c79e5b3e9a
|
bug
|
2024-02-28 18:02:53 +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 |
|
@QQNZX
|
ec24a5c512
|
Merge remote-tracking branch 'origin/master'
|
2024-02-28 16:44:42 +08:00 |
|
@QQNZX
|
2a1e878492
|
前端
|
2024-02-28 16:44:30 +08:00 |
|
wangh
|
d570586be5
|
no message
|
2024-02-28 13:24:53 +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 |
|
@QQNZX
|
99358ea32b
|
前端
|
2024-02-27 09:12:28 +08:00 |
|
|
|
e47d92d168
|
bug
|
2024-02-26 19:27:54 +08:00 |
|
@QQNZX
|
55280a68ce
|
Merge remote-tracking branch 'origin/master'
|
2024-02-26 17:32:11 +08:00 |
|
@QQNZX
|
7d70f64284
|
前端
|
2024-02-26 17:31:57 +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 |
|
@QQNZX
|
e98e5bf217
|
前端
|
2024-02-26 13:42:47 +08:00 |
|
|
|
7bda79899f
|
bug
|
2024-02-26 10:12:19 +08:00 |
|
|
|
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 |
|
|
|
08d2140ca7
|
bug
|
2024-02-22 17:53:41 +08:00 |
|
|
|
76e1a578ba
|
bug
|
2024-02-21 17:59:58 +08:00 |
|
|
|
702dceb375
|
bug
|
2024-02-21 17:02:13 +08:00 |
|
|
|
aafc706625
|
卡管理
|
2024-02-21 16:10:40 +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 |
|
|
|
bf998c65b6
|
bug
|
2024-02-20 17:52:09 +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 |
|
|
|
b137edcac0
|
bug
|
2024-02-19 16:03:34 +08:00 |
|
|
|
9b11659153
|
bug
|
2024-02-18 18:09:52 +08:00 |
|
wangh
|
e5a24d3c83
|
no message
|
2024-02-07 17:29:50 +08:00 |
|
|
|
3c6defd2c6
|
bug
|
2024-02-06 16:48:14 +08:00 |
|
|
|
fd0091634f
|
bug
|
2024-02-06 16:35:34 +08:00 |
|
|
|
ef6ee5aef0
|
bug
|
2024-02-06 13:38:17 +08:00 |
|
|
|
bfef076269
|
bug
|
2024-02-06 11:38:42 +08:00 |
|
@QQNZX
|
33575a8e95
|
前端
|
2024-02-06 09:10:18 +08:00 |
|
|
|
7c538e5aab
|
bug
|
2024-02-05 18:09:05 +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 |
|
|
|
9f5d333798
|
bug
|
2024-02-04 18:08:43 +08:00 |
|
|
|
033a66f12d
|
bug
|
2024-02-04 13:37:04 +08:00 |
|
|
|
b1b8797ad0
|
bug
|
2024-02-03 17:37:34 +08:00 |
|
|
|
e38c87edaf
|
bug
|
2024-02-03 13:47:34 +08:00 |
|
@QQNZX
|
4f377a7212
|
前端
|
2024-02-03 09:33:52 +08:00 |
|
|
|
206f171544
|
bug
|
2024-02-02 18:02:17 +08:00 |
|
|
|
63f4fcfbf4
|
bug
|
2024-02-02 15:31:02 +08:00 |
|
|
|
974fd2be7c
|
bug
|
2024-02-02 14:18:16 +08:00 |
|
|
|
d463a82cd6
|
bug
|
2024-02-02 09:35:14 +08:00 |
|
wangh
|
6c39c09d98
|
no message
|
2024-02-02 09:04:04 +08:00 |
|
|
|
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 |
|
|
|
273e38494c
|
bug
|
2024-02-01 10:03:16 +08:00 |
|
|
|
8a943fdb10
|
bug
|
2024-01-31 17:05:12 +08:00 |
|
|
|
788fba4dae
|
bug
|
2024-01-30 19:40:58 +08:00 |
|
|
|
63ca5ca01b
|
bug
|
2024-01-30 18:36:40 +08:00 |
|
|
|
d5a7ddd1d2
|
Merge remote-tracking branch 'origin/master'
|
2024-01-30 18:13:02 +08:00 |
|
|
|
1d6f84a76a
|
一键发券
|
2024-01-30 18:12:51 +08:00 |
|
|
|
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
|
a882859c82
|
no message
|
2024-01-30 09:56:24 +08:00 |
|
|
|
cedf3c7281
|
bug
|
2024-01-29 18:18:30 +08:00 |
|
@QQNZX
|
b5c6f8382f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/pages/index/index.vue
|
2024-01-29 14:50:40 +08:00 |
|
@QQNZX
|
83629529d5
|
前端
|
2024-01-29 14:50:20 +08:00 |
|
|
|
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 |
|
|
|
acf41325ef
|
一键发券
|
2024-01-29 14:11:02 +08:00 |
|
|
|
60ccc78c46
|
bug
|
2024-01-29 09:50:28 +08:00 |
|
|
|
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 |
|
|
|
a51ebc2ce3
|
bug
|
2024-01-27 14:10:02 +08:00 |
|
|
|
32cb50848f
|
bug
|
2024-01-27 10:51:32 +08:00 |
|
|
|
249b30da4d
|
bug
|
2024-01-27 09:05:50 +08:00 |
|
|
|
c1bb1af124
|
bug
|
2024-01-26 13:33:09 +08:00 |
|
|
|
d54ef244a8
|
bug
|
2024-01-25 18:27:19 +08:00 |
|
wangh
|
3d3ea7ba06
|
no message
|
2024-01-25 16:48:08 +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 |
|
|
|
6976d3e7ce
|
bug
|
2024-01-25 10:13:43 +08:00 |
|
|
|
18ce89b555
|
bug
|
2024-01-25 09:18:06 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
819624e4e8
|
bug
|
2024-01-24 14:35:00 +08:00 |
|
|
|
cf631ad033
|
bug
|
2024-01-23 18:14:56 +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 |
|
|
|
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 |
|
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 |
|
|
|
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
|
3054607717
|
bug修改
|
2024-01-09 17:09:45 +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 |
|
|
|
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 |
|
|
|
6813f67d38
|
优化项
|
2024-01-06 18:04:36 +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
|
6119bba60b
|
no message
|
2024-01-06 15:07:18 +08:00 |
|
|
|
683b41e456
|
优化项
|
2024-01-06 13:37:21 +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 |
|
|
|
d92c33373a
|
修改bug
|
2024-01-05 18:19:48 +08:00 |
|
wangh
|
ea900039d4
|
bug处理
|
2024-01-05 16:53:19 +08:00 |
|
@QQNZX
|
9acd5324d5
|
前端
|
2024-01-05 14:02:20 +08:00 |
|
|
|
cff6a8942b
|
优化项
|
2024-01-04 18:44:52 +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 |
|
@QQNZX
|
d22f21bf03
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/config.js
|
2024-01-04 09:11:09 +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 |
|
@QQNZX
|
0ecf231fd5
|
Merge remote-tracking branch 'origin/master'
|
2024-01-04 09:06:45 +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 |
|
|
|
12f4741acf
|
优化项
|
2024-01-03 18:40:21 +08:00 |
|
@QQNZX
|
03b512ef75
|
前端 模板的更新
|
2024-01-03 14:24:24 +08:00 |
|
|
|
a9b86ff520
|
Merge remote-tracking branch 'origin/master'
|
2024-01-03 09:12:08 +08:00 |
|
|
|
5d2b98d6fa
|
修改bug
|
2024-01-03 09:11:56 +08:00 |
|
|
|
b5d55b69f1
|
优化项
|
2024-01-02 18:36:47 +08:00 |
|
|
|
76befae703
|
优化项
|
2024-01-02 17:13:25 +08:00 |
|
@QQNZX
|
f161d1368a
|
前端
|
2024-01-02 15:56:33 +08:00 |
|
wangh
|
eac375458b
|
bug修改
|
2024-01-02 14:24:47 +08:00 |
|
wangh
|
adfb53bac2
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintAdmin_zt/.env.development
# fuintBackend/configure/dev/application.properties
# fuintBackend/fuint-application/src/main/resources/application.properties
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2024-01-02 11:29:51 +08:00 |
|
wangh
|
9f3dadf902
|
no message
|
2024-01-02 11:22:29 +08:00 |
|
wangh
|
9e403cd413
|
bug修改+中泰
|
2024-01-02 11:21:12 +08:00 |
|
@QQNZX
|
9974798e58
|
前端
|
2024-01-02 10:04:57 +08:00 |
|
|
|
53a7cce4dc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-29 13:40:44 +08:00 |
|
|
|
239aa0aeab
|
静态图片
|
2023-12-27 16:08:50 +08:00 |
|
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44:50 +08:00 |
|
wangh
|
0c222c88a5
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-22 15:34:06 +08:00 |
|
wangh
|
087ce92cbf
|
中台处理
|
2023-12-22 15:33:38 +08:00 |
|
|
|
52379f54d0
|
加油信息
|
2023-12-19 18:03:05 +08:00 |
|
|
|
ffeb4a4254
|
门店信息
|
2023-12-18 18:44:02 +08:00 |
|
wangh
|
b4cdb77bdf
|
no message
|
2023-12-18 17:44:23 +08:00 |
|
wangh
|
026b7e6d0b
|
主页的数据统计
|
2023-12-18 17:42:52 +08:00 |
|
@QQNZX
|
bfd2ed0eeb
|
油站pc
|
2023-12-14 15:26:00 +08:00 |
|
wangh
|
f0f50652e3
|
pc端 增加个人统计 和数据统计
|
2023-12-14 13:39:27 +08:00 |
|
wangh
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
wangh
|
841b823692
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-09 15:27:17 +08:00 |
|
wangh
|
e09841a85a
|
信息统计
|
2023-12-09 15:23:37 +08:00 |
|
|
|
ce0c69be7a
|
bug 12.08
|
2023-12-08 13:33:52 +08:00 |
|
wangh
|
f50982f0e6
|
充值订单
|
2023-12-07 10:22:52 +08:00 |
|
@QQNZX
|
3e22074fa1
|
12.05前端
|
2023-12-05 11:41:42 +08:00 |
|
@QQNZX
|
1042b55806
|
12.05前端
|
2023-12-05 11:16:58 +08:00 |
|
wangh
|
869f189c4d
|
no message
|
2023-12-05 09:24:31 +08:00 |
|
|
|
cadeccf2f8
|
储值卡
|
2023-12-01 16:49:10 +08:00 |
|
|
|
c4839870bc
|
会员信息
|
2023-12-01 15:40:43 +08:00 |
|
|
|
d48a4cabe7
|
会员信息
|
2023-11-30 18:30:46 +08:00 |
|
|
|
41cabe23d1
|
Merge remote-tracking branch 'origin/master'
|
2023-11-30 11:57:53 +08:00 |
|
|
|
e42e7dbbe3
|
会员信息
|
2023-11-30 11:48:14 +08:00 |
|
|
|
eecf1a94bd
|
提交忽略文件
|
2023-11-30 10:56:05 +08:00 |
|
|
|
f920b643aa
|
会员信息
|
2023-11-29 18:33:09 +08:00 |
|
|
|
71b21efc27
|
会员信息
|
2023-11-29 17:18:28 +08:00 |
|
@QQNZX
|
56449e11de
|
Merge remote-tracking branch 'origin/master'
|
2023-11-29 16:53:14 +08:00 |
|
@QQNZX
|
c9f277771f
|
11.29前端
|
2023-11-29 16:52:59 +08:00 |
|
|
|
491c8bf426
|
会员信息
|
2023-11-29 16:26:19 +08:00 |
|
|
|
cec9d85b3a
|
收银台
|
2023-11-28 18:33:35 +08:00 |
|
|
|
f30a3556e3
|
收银台
|
2023-11-27 18:28:41 +08:00 |
|
wangh
|
b00edb2f12
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-25 18:08:58 +08:00 |
|
wangh
|
7ea34fc665
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-25 18:08:29 +08:00 |
|
|
|
3f76359c59
|
收银台
|
2023-11-25 18:08:20 +08:00 |
|
wangh
|
90a3adc44f
|
bug
修改
|
2023-11-25 18:08:15 +08:00 |
|
@QQNZX
|
ac1c6325de
|
11.25前端
|
2023-11-25 18:07:50 +08:00 |
|
