wangh
|
e745341b4a
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-03-05 16:59:54 +08:00 |
|
wangh
|
8ab4844445
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
|
2024-03-05 16:59:22 +08:00 |
|
|
|
5c0172fa32
|
bug
|
2024-03-05 16:58:28 +08:00 |
|
wangh
|
2e55066c72
|
no message
|
2024-03-05 16:42:59 +08:00 |
|
|
|
d0707345f5
|
Merge remote-tracking branch 'origin/master'
|
2024-03-05 15:55:58 +08:00 |
|
|
|
9e1da10fc5
|
bug
|
2024-03-05 15:55:51 +08:00 |
|
|
|
83b16a32e3
|
bug
|
2024-03-05 15:44:43 +08:00 |
|
|
|
4b1ee8a19f
|
bug
|
2024-03-05 14:16:43 +08:00 |
|
|
|
3a535078bd
|
Merge remote-tracking branch 'origin/master'
|
2024-03-05 11:22:57 +08:00 |
|
|
|
3eab5df6b6
|
bug
|
2024-03-05 11:22:51 +08:00 |
|
|
|
c09a30d546
|
bug
|
2024-03-05 09:54:51 +08:00 |
|
|
|
66edef025b
|
Merge remote-tracking branch 'origin/master'
|
2024-03-05 09:20:17 +08:00 |
|
|
|
3492885ff2
|
bug
|
2024-03-05 09:20:04 +08:00 |
|
|
|
ed7b346706
|
bug
|
2024-03-05 09:11:51 +08:00 |
|
wangh
|
0264b284a3
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
|
2024-03-04 16:48:14 +08:00 |
|
wangh
|
a504720e4c
|
no message
|
2024-03-04 16:47:16 +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 |
|
|
|
6e2e6830ed
|
bug
|
2024-03-04 14:25:20 +08:00 |
|
|
|
2acc8efe2c
|
Merge remote-tracking branch 'origin/master'
|
2024-03-04 13:37:46 +08:00 |
|
|
|
d96d1f1e53
|
一键发券
|
2024-03-04 13:37:29 +08:00 |
|
wangh
|
873cf444e8
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2024-03-04 09:58:10 +08:00 |
|
wangh
|
509fa7aa3b
|
no message
|
2024-03-04 09:53:32 +08:00 |
|
|
|
2552723bfd
|
bug
|
2024-03-02 17:58:59 +08:00 |
|
|
|
9d869e404f
|
bug
|
2024-03-02 16:41:18 +08:00 |
|
|
|
24818cb60e
|
bug
|
2024-03-01 17:55:13 +08:00 |
|
|
|
ec24649985
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 15:40:30 +08:00 |
|
|
|
72323b9019
|
推荐有礼
|
2024-03-01 15:40:23 +08:00 |
|
|
|
55e449a45d
|
bug
|
2024-03-01 15:38:46 +08:00 |
|
|
|
1177caac17
|
推荐有礼
|
2024-03-01 15:11:10 +08:00 |
|
|
|
72449acbb7
|
推荐有礼
|
2024-03-01 15:07:56 +08:00 |
|
|
|
a16552120f
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 14:16:58 +08:00 |
|
|
|
223a1908f3
|
推荐有礼
|
2024-03-01 14:16:48 +08:00 |
|
|
|
c71ddb7e82
|
bug
|
2024-02-29 18:06:34 +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 |
|
|
|
1fe8922e14
|
推荐有礼
|
2024-02-28 17:06:16 +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 |
|
wangh
|
2a6abf3b57
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-02-28 13:25:00 +08:00 |
|
wangh
|
d570586be5
|
no message
|
2024-02-28 13:24:53 +08:00 |
|
|
|
101ef539c3
|
bug
|
2024-02-27 17:59:16 +08:00 |
|
wangh
|
570f8c9c0f
|
no message
|
2024-02-27 15:32:58 +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 |
|
|
|
e47d92d168
|
bug
|
2024-02-26 19:27:54 +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 |
|
|
|
a69b4d806e
|
bug
|
2024-02-26 15:05:21 +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 |
|
|
|
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 |
|
