dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,281 Commits 2 Branches 0 Tags 190 MiB
d31e230e8c
Commit Graph

818 Commits

Author SHA1 Message Date
齐天大圣
6bcb8dc254 bug 2024-03-08 14:55:04 +08:00
cun-nan
7de40caf1f bug 2024-03-08 14:45:14 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
2e3575b4de bug 2024-03-07 16:11:59 +08:00
cun-nan
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
cun-nan
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
cun-nan
ad80d44ef9 bug 2024-03-07 13:37:12 +08:00
cun-nan
5f6e4186e0 bug 2024-03-07 12:10:12 +08:00
cun-nan
33c27b15a1 bug 2024-03-07 12:03:58 +08:00
cun-nan
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
cun-nan
69c0516825 bug 2024-03-07 11:31:53 +08:00
齐天大圣
470fed9d7c bug 2024-03-07 11:23:56 +08:00
cun-nan
5da7530631 bug 2024-03-07 11:14:02 +08:00
cun-nan
d9d69baff5 bug 2024-03-07 11:06:57 +08:00
cun-nan
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
cun-nan
a95e05f830 bug 2024-03-07 09:49:31 +08:00
cun-nan
09fd7d1e04 bug 2024-03-07 09:31:51 +08:00
cun-nan
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
cun-nan
3429ec8cbb bug 2024-03-06 17:26:37 +08:00
cun-nan
519155c263 bug 2024-03-06 16:45:11 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
83b16a32e3 bug 2024-03-05 15:44:43 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
2552723bfd bug 2024-03-02 17:58:59 +08:00
cun-nan
9d869e404f bug 2024-03-02 16:41:18 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
a69b4d806e bug 2024-02-26 15:05:21 +08:00
cun-nan
7bda79899f bug 2024-02-26 10:12:19 +08:00
cun-nan
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
cun-nan
08d2140ca7 bug 2024-02-22 17:53:41 +08:00
cun-nan
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
cun-nan
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
cun-nan
bf998c65b6 bug 2024-02-20 17:52:09 +08:00
cun-nan
857f954c2c bug 2024-02-20 13:33:34 +08:00
cun-nan
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
cun-nan
3b64908eb7 bug 2024-02-20 10:54:06 +08:00
cun-nan
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
cun-nan
b137edcac0 bug 2024-02-19 16:03:34 +08:00
cun-nan
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
cun-nan
1ff31e1338 bug 2024-02-06 18:10:15 +08:00
cun-nan
3c6defd2c6 bug 2024-02-06 16:48:14 +08:00
cun-nan
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
cun-nan
bfef076269 bug 2024-02-06 11:38:42 +08:00
@QQNZX
33575a8e95 前端 2024-02-06 09:10:18 +08:00
cun-nan
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
cun-nan
9f5d333798 bug 2024-02-04 18:08:43 +08:00
cun-nan
033a66f12d bug 2024-02-04 13:37:04 +08:00
cun-nan
b1b8797ad0 bug 2024-02-03 17:37:34 +08:00
wangh
d05c5d8efb 油品盘点 2024-02-03 15:28:56 +08:00