Commit Graph

992 Commits

Author SHA1 Message Date
186cf48a2c bug 2024-03-15 17:41:54 +08:00
c9d31d47d3 bug 2024-03-15 16:12:04 +08:00
4087dbc978 Merge remote-tracking branch 'origin/master' 2024-03-15 15:40:47 +08:00
36bc1495bd bug 2024-03-15 15:40:37 +08:00
39b84372d9 bug 2024-03-15 14:57:29 +08:00
349668eaaa bug 2024-03-15 14:39:47 +08:00
bebc6798da bug 2024-03-15 13:45:56 +08:00
d8f1077d25 bug 2024-03-15 11:38:57 +08:00
ec8a9e969c bug 2024-03-15 11:12:27 +08:00
4328a0dd4b Merge remote-tracking branch 'origin/master' 2024-03-15 10:48:59 +08:00
aa07c3f617 bug 2024-03-15 10:48:49 +08:00
a3a532faaf bug 2024-03-15 10:44:21 +08:00
39f2709f54 bug 2024-03-15 09:40:01 +08:00
d85a897b5c bug 2024-03-15 09:30:28 +08:00
98406ae1b4 bug 2024-03-15 09:01:19 +08:00
6e88b800c1 bug 2024-03-14 16:02:02 +08:00
e65c175ef6 bug 2024-03-14 16:00:44 +08:00
f73ae86ba0 Merge remote-tracking branch 'origin/master' 2024-03-14 15:46:24 +08:00
daf9f4ff97 bug 2024-03-14 15:46:09 +08:00
b1d49e4ece bug 2024-03-14 15:39:19 +08:00
e866e54756 bug 2024-03-14 15:18:49 +08:00
9c8addf216 bug 2024-03-14 12:04:23 +08:00
13c67f01c7 bug 2024-03-14 11:53:02 +08:00
5a42f4efa0 bug 2024-03-14 09:21:48 +08:00
bc54119f5d Merge remote-tracking branch 'origin/master' 2024-03-13 17:05:48 +08:00
3e6ed0511b bug 2024-03-13 17:05:40 +08:00
be3c321ee0 bug 2024-03-13 17:02:23 +08:00
73e22aff6c bug 2024-03-13 16:59:43 +08:00
f16f8ff79a Merge remote-tracking branch 'origin/master' 2024-03-13 16:43:59 +08:00
62df5c5533 bug 2024-03-13 16:43:30 +08:00
785bb0b3b8 bug 2024-03-13 16:43:28 +08:00
d90ed73ed5 bug 2024-03-13 16:43:23 +08:00
a57a04dc87 bug 2024-03-13 16:18:40 +08:00
8b69eae4bb Merge remote-tracking branch 'origin/master' 2024-03-13 16:16:14 +08:00
503632e769 bug 2024-03-13 16:16:05 +08:00
5282713b98 bug 2024-03-13 15:40:48 +08:00
854a3242bb bug 2024-03-13 11:18:21 +08:00
de79de4b58 bug 2024-03-13 10:59:27 +08:00
26c8c6544e bug 2024-03-13 10:09:10 +08:00
eee9790aba bug 2024-03-12 18:06:12 +08:00
fb07dc3458 bug 2024-03-12 17:29:18 +08:00
f1e58fc93f Merge remote-tracking branch 'origin/master' 2024-03-12 17:01:07 +08:00
97893c2cb2 bug 2024-03-12 17:00:59 +08:00
b4252e6d82 bug 2024-03-12 16:57:45 +08:00
c22fd9ee3c bug 2024-03-12 16:02:33 +08:00
ad4194bfd6 Merge remote-tracking branch 'origin/master' 2024-03-12 15:57:34 +08:00
c45207dc8f bug 2024-03-12 15:57:19 +08:00
fab351bd41 bug 2024-03-12 15:52:45 +08:00
c0a282e71c bug 2024-03-12 15:51:04 +08:00
918efbd372 bug 2024-03-12 14:08:40 +08:00
aaf5ac2f90 Merge remote-tracking branch 'origin/master' 2024-03-12 11:35:51 +08:00
eba53ae473 bug 2024-03-12 11:35:29 +08:00
cad70e53c6 bug 2024-03-12 09:55:14 +08:00
094804d122 bug 2024-03-11 18:05:45 +08:00
80f87ca256 bug 2024-03-11 17:11:47 +08:00
444cf4952d bug 2024-03-11 15:06:04 +08:00
446cab6fb5 bug 2024-03-11 14:37:09 +08:00
e9a65f91dd bug 2024-03-11 14:07:54 +08:00
13eef7e362 bug 2024-03-11 13:11:54 +08:00
0f7ba19407 bug 2024-03-11 11:13:57 +08:00
0e95e453e3 Merge remote-tracking branch 'origin/master' 2024-03-11 10:46:04 +08:00
8e6cb5413b bug 2024-03-11 10:45:22 +08:00
5a3f811a95 bug 2024-03-11 10:33:51 +08:00
50a2c9c9a0 bug 2024-03-11 10:05:46 +08:00
3645e64d6f bug 2024-03-11 09:53:30 +08:00
de5f474687 bug 2024-03-08 17:55:52 +08:00
0d564e2113 bug 2024-03-08 17:15:37 +08:00
e59375cc91 bug 2024-03-08 16:38:35 +08:00
dcb164e4fc bug 2024-03-08 16:25:53 +08:00
54e14b63a1 Merge remote-tracking branch 'origin/master' 2024-03-08 15:17:16 +08:00
cb675d3445 bug 2024-03-08 15:17:08 +08:00
ec1c438668 bug 2024-03-08 15:15:34 +08:00
1b0c493806 bug 2024-03-08 15:10:24 +08:00
630af7e384 Merge remote-tracking branch 'origin/master' 2024-03-08 14:55:39 +08:00
6bcb8dc254 bug 2024-03-08 14:55:04 +08:00
7de40caf1f bug 2024-03-08 14:45:14 +08:00
1de2f106b6 bug 2024-03-08 14:14:30 +08:00
c9f54f1bb8 bug 2024-03-08 09:30:21 +08:00
a96a7f3773 bug 2024-03-07 18:12:40 +08:00
c65a6c6bd9 Merge remote-tracking branch 'origin/master' 2024-03-07 17:52:09 +08:00
9edf510ca1 bug 2024-03-07 17:51:27 +08:00
2f4c1ab5b9 bug 2024-03-07 17:40:32 +08:00
6f8c252d2b bug 2024-03-07 17:20:55 +08:00
417a38f7a5 Merge remote-tracking branch 'origin/master' 2024-03-07 17:03:03 +08:00
43140c41ab bug 2024-03-07 17:02:51 +08:00
57adb30134 bug 2024-03-07 17:00:09 +08:00
1531eef136 bug 2024-03-07 16:36:04 +08:00
fee077d015 Merge remote-tracking branch 'origin/master' 2024-03-07 16:23:45 +08:00
42f76872b8 bug 2024-03-07 16:23:33 +08:00
2e3575b4de bug 2024-03-07 16:11:59 +08:00
46ec7907a3 bug 2024-03-07 14:53:54 +08:00
173cac0da9 Merge remote-tracking branch 'origin/master' 2024-03-07 14:31:45 +08:00
27ccbb65f9 bug 2024-03-07 14:30:57 +08:00
b2dfaa9579 bug 2024-03-07 14:10:07 +08:00
42afda3a8a Merge remote-tracking branch 'origin/master' 2024-03-07 13:53:19 +08:00
805738c584 bug 2024-03-07 13:52:15 +08:00
ad80d44ef9 bug 2024-03-07 13:37:12 +08:00
5f6e4186e0 bug 2024-03-07 12:10:12 +08:00
33c27b15a1 bug 2024-03-07 12:03:58 +08:00
78795abc73 bug 2024-03-07 11:47:11 +08:00
87732aaa2c Merge remote-tracking branch 'origin/master' 2024-03-07 11:37:20 +08:00
6a976628eb bug 2024-03-07 11:37:10 +08:00
69c0516825 bug 2024-03-07 11:31:53 +08:00
470fed9d7c bug 2024-03-07 11:23:56 +08:00
5da7530631 bug 2024-03-07 11:14:02 +08:00
d9d69baff5 bug 2024-03-07 11:06:57 +08:00
8fb0f54ce4 bug 2024-03-07 11:01:35 +08:00
6870bfc061 Merge remote-tracking branch 'origin/master' 2024-03-07 10:44:40 +08:00
c6d940a8ed bug 2024-03-07 10:44:07 +08:00
a95e05f830 bug 2024-03-07 09:49:31 +08:00
09fd7d1e04 bug 2024-03-07 09:31:51 +08:00
e175eeda8a bug 2024-03-06 17:33:14 +08:00
1e6585490e Merge remote-tracking branch 'origin/master' 2024-03-06 17:30:41 +08:00
b50287eaba bug 2024-03-06 17:30:32 +08:00
3429ec8cbb bug 2024-03-06 17:26:37 +08:00
519155c263 bug 2024-03-06 16:45:11 +08:00
56b4579524 bug 2024-03-06 16:25:10 +08:00
81e69b6e0b bug 2024-03-06 15:55:55 +08:00
b52fa58a67 bug 2024-03-06 15:37:39 +08:00
7e35f59abc Merge remote-tracking branch 'origin/master' 2024-03-06 15:00:34 +08:00
8aab85ecd4 bug 2024-03-06 15:00:19 +08:00
ae83dac42d bug 2024-03-06 14:55:15 +08:00
e7494cd08e bug 2024-03-06 14:51:30 +08:00
e73ff9722c Merge remote-tracking branch 'origin/master' 2024-03-06 14:27:54 +08:00
12c27fa77c bug 2024-03-06 14:27:42 +08:00
f72028b3b9 bug 2024-03-06 14:22:45 +08:00
c7e78cc1c5 Merge remote-tracking branch 'origin/master' 2024-03-06 11:41:29 +08:00
98e13da32d bug 2024-03-06 11:41:18 +08:00
cddb9231a5 bug 2024-03-06 11:28:57 +08:00
f9be9ea02d bug 2024-03-06 10:04:25 +08:00
595227b921 bug 2024-03-06 09:14:48 +08:00
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