|
|
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 |
|
|
|
1c844fd619
|
Merge remote-tracking branch 'origin/master'
|
2024-02-21 17:34:42 +08:00 |
|
|
|
535d727d14
|
卡管理
|
2024-02-21 17:34:35 +08:00 |
|
|
|
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 |
|
|
|
bf998c65b6
|
bug
|
2024-02-20 17:52:09 +08:00 |
|
|
|
857f954c2c
|
bug
|
2024-02-20 13:33:34 +08:00 |
|
|
|
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 |
|
|
|
3b64908eb7
|
bug
|
2024-02-20 10:54:06 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
1ff31e1338
|
bug
|
2024-02-06 18:10:15 +08:00 |
|
|
|
3c6defd2c6
|
bug
|
2024-02-06 16:48:14 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
e38c87edaf
|
bug
|
2024-02-03 13:47:34 +08:00 |
|
|
|
206f171544
|
bug
|
2024-02-02 18:02:17 +08:00 |
|
|
|
974fd2be7c
|
bug
|
2024-02-02 14:18:16 +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 |
|
|
|
79d073b26c
|
bug
|
2024-01-31 18:41:47 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
237466ee75
|
bug
|
2024-01-29 11:51:24 +08:00 |
|
|
|
f325084e07
|
一键发券
|
2024-01-29 10:42:15 +08:00 |
|
|
|
60ccc78c46
|
bug
|
2024-01-29 09:50:28 +08:00 |
|
|
|
285616700b
|
bug
|
2024-01-28 18:55:43 +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 |
|
|
|
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 |
|
|
|
de750590f1
|
bug
|
2024-01-27 11:35:35 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
819624e4e8
|
bug
|
2024-01-24 14:35:00 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3a6f73f33e
|
bug
|
2024-01-23 09:55:23 +08:00 |
|
|
|
25cd5cb003
|
bug
|
2024-01-23 09:26:10 +08:00 |
|
|
|
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 |
|
|
|
cadb4ce475
|
bug
|
2024-01-22 14:25:45 +08:00 |
|
|
|
8e893ae4d4
|
bug
|
2024-01-22 13:29:42 +08:00 |
|
|
|
179f49c58f
|
bug
|
2024-01-22 11:51:12 +08:00 |
|
|
|
63ec546d5c
|
bug
|
2024-01-22 10:32:13 +08:00 |
|
|
|
196d7f41ad
|
bug
|
2024-01-22 10:09:43 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8d249e7e5e
|
bug
|
2024-01-19 13:44:13 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ab81e62477
|
bug
|
2024-01-18 15:09:51 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
cf1c679d19
|
优化项
|
2024-01-05 09:17:23 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
wangh
|
eac375458b
|
bug修改
|
2024-01-02 14:24:47 +08:00 |
|
|
|
c86397d612
|
Merge remote-tracking branch 'origin/master'
|
2024-01-02 12:45:52 +08:00 |
|
|
|
3389960aa5
|
充值记录
|
2024-01-02 12:45:39 +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
|
9e403cd413
|
bug修改+中泰
|
2024-01-02 11:21:12 +08:00 |
|
@QQNZX
|
9974798e58
|
前端
|
2024-01-02 10:04:57 +08:00 |
|
|
|
53062019b4
|
Merge remote-tracking branch 'origin/master'
|
2024-01-02 09:18:54 +08:00 |
|
|
|
7154546662
|
充值记录
|
2024-01-02 09:18:45 +08:00 |
|
|
|
b5341ed627
|
首页banner图
|
2023-12-29 16:50:44 +08:00 |
|
|
|
a5d998b02d
|
满减
|
2023-12-29 15:27:06 +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 |
|
|
|
78fb118550
|
充值记录
|
2023-12-29 13:38:00 +08:00 |
|
|
|
830e435b56
|
子卡信息
|
2023-12-28 17:31:50 +08:00 |
|
|
|
cd24222c2a
|
子卡信息
|
2023-12-28 13:14:35 +08:00 |
|
|
|
323add1517
|
会员信息
|
2023-12-27 18:44:56 +08:00 |
|
wangh
|
c9dbe51f22
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-27 09:11:48 +08:00 |
|
wangh
|
0f7c14444d
|
完善站长一键登录+修改中台出现的bug
|
2023-12-27 09:11:43 +08:00 |
|
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44:50 +08:00 |
|
wangh
|
22d78d8b5f
|
小票打印--积分支付--中台设置流水
|
2023-12-26 09:50:37 +08:00 |
|
|
|
9edf62a5a2
|
二维码
|
2023-12-25 18:10:00 +08:00 |
|
|
|
6faf9677e1
|
充值记录
|
2023-12-25 15:21:10 +08:00 |
|
|
|
dfba5774b0
|
充值记录
|
2023-12-25 14:53:08 +08:00 |
|
|
|
92aac838c5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
|
2023-12-25 14:44:23 +08:00 |
|
|
|
42869c8cd7
|
充值记录
|
2023-12-25 14:41:17 +08:00 |
|
|
|
24716f59be
|
正在使用的商户状态
|
2023-12-25 11:17:36 +08:00 |
|
|
|
dd1a564f60
|
生成二维码信息
|
2023-12-23 18:17:19 +08:00 |
|
|
|
8ab6707977
|
小程序支付
|
2023-12-23 09:19:34 +08:00 |
|
wangh
|
5cc1c5bb3f
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-22 18:18:25 +08:00 |
|
wangh
|
8148002ce2
|
no message
|
2023-12-22 18:18:21 +08:00 |
|
|
|
c6d27473ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-22 17:02:09 +08:00 |
|
|
|
b0aa720ccb
|
充值记录
|
2023-12-22 17:01:13 +08:00 |
|
|
|
b9bac4a4b0
|
小程序支付
|
2023-12-22 16:33:34 +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 |
|
|
|
536614d596
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/pages/my/my.vue
|
2023-12-21 17:49:34 +08:00 |
|
|
|
cc69c78e3e
|
小程序端推荐有礼
|
2023-12-21 17:48:13 +08:00 |
|
|
|
8a3ee12f1d
|
小程序支付
|
2023-12-20 16:04:56 +08:00 |
|
|
|
b5696f8dec
|
Merge remote-tracking branch 'origin/master'
|
2023-12-20 14:30:54 +08:00 |
|
|
|
89010cb79d
|
小程序端新人有礼活动
|
2023-12-20 14:30:37 +08:00 |
|
wangh
|
4641b04b65
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-19 16:54:53 +08:00 |
|
wangh
|
89bf856d96
|
no message
|
2023-12-19 16:54:46 +08:00 |
|
wangh
|
79a9d8e47e
|
数据统计
|
2023-12-19 16:54:02 +08:00 |
|
|
|
ffeb4a4254
|
门店信息
|
2023-12-18 18:44:02 +08:00 |
|
|
|
f76021b177
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 17:55:09 +08:00 |
|
|
|
65ba434d19
|
子卡管理
|
2023-12-18 17:54:43 +08:00 |
|
wangh
|
96f978ae11
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelRecordMapper.java
|
2023-12-18 17:43:57 +08:00 |
|
wangh
|
026b7e6d0b
|
主页的数据统计
|
2023-12-18 17:42:52 +08:00 |
|
|
|
0a4cde035f
|
子卡管理
|
2023-12-18 17:32:37 +08:00 |
|
|
|
f8a1fdea61
|
修改小程序端的活动展示方式
|
2023-12-18 15:10:29 +08:00 |
|
