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

1084 Commits

Author SHA1 Message Date
DESKTOP-369JRHT\12997
16f77aca55 no message 2024-05-30 16:43:03 +08:00
齐天大圣
fe84e7d8c7 pos 2024-05-30 16:15:30 +08:00
齐天大圣
6b07a13ce2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
 2024-05-30 16:07:17 +08:00
齐天大圣
8ee3862433 pos 2024-05-30 16:06:55 +08:00
DESKTOP-369JRHT\12997
d6684b413d Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-30 16:05:20 +08:00
DESKTOP-369JRHT\12997
543eb2d35e no message 2024-05-30 16:05:16 +08:00
cun-nan
a7792e4b20 bug 2024-05-29 17:37:23 +08:00
DESKTOP-369JRHT\12997
aff136295e Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	pos-uni/pages/my/my.vue
 2024-05-29 15:16:16 +08:00
DESKTOP-369JRHT\12997
3ab8bb27d5 no message 2024-05-29 15:15:33 +08:00
cun-nan
70d1a50a04 bug 2024-05-29 11:05:24 +08:00
齐天大圣
39d6919db3 pos首页前三个订单 2024-05-29 10:28:39 +08:00
DESKTOP-369JRHT\12997
9269d6cbb3 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-28 14:17:55 +08:00
DESKTOP-369JRHT\12997
3e6420346c no message 2024-05-28 14:17:49 +08:00
齐天大圣
ea25f5e16d Merge remote-tracking branch 'origin/master' 2024-05-28 14:10:20 +08:00
齐天大圣
f1d71d2a22 bug 2024-05-28 14:10:07 +08:00
cun-nan
f2cf5bffdb bug 2024-05-28 14:06:53 +08:00
cun-nan
5549f1d0c7 bug 2024-05-28 09:01:56 +08:00
DESKTOP-369JRHT\12997
6be451328e Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-28 08:40:22 +08:00
DESKTOP-369JRHT\12997
e8ab427cdc no message 2024-05-28 08:40:17 +08:00
cun-nan
dfce05d949 bug 2024-05-27 16:56:51 +08:00
cun-nan
c0edca907c Merge remote-tracking branch 'origin/master' 2024-05-27 08:44:55 +08:00
xvv
bfa10dd5c9 pos 端 2024-05-25 13:43:04 +08:00
DESKTOP-369JRHT\12997
3453f37647 no message 2024-05-24 17:50:55 +08:00
cun-nan
3b86da3ef5 bug 2024-05-24 16:44:13 +08:00
cun-nan
0a47825124 bug 2024-05-23 15:56:57 +08:00
wangh
0cc396634b no message 2024-05-23 12:01:13 +08:00
wangh
e35ead2d45 no message 2024-05-23 11:47:58 +08:00
wangh
a506009491 no message 2024-05-23 09:39:52 +08:00
cun-nan
1b2af2f8a2 bug 2024-05-23 09:26:04 +08:00
wangh
14a3c56a73 no message 2024-05-23 09:18:59 +08:00
wangh
3c9f416174 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintCashierWeb/.env.development
 2024-05-22 17:14:32 +08:00
wangh
963c46324c no message 2024-05-22 17:12:19 +08:00
cun-nan
513948427c bug 2024-05-22 14:27:40 +08:00
齐天大圣
c2fed313b9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java
 2024-05-21 09:51:11 +08:00
齐天大圣
226cab681e 优惠统计 2024-05-21 09:50:27 +08:00
wangh
302abd49e9 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-17 16:14:23 +08:00
wangh
5cfc735ae4 no message 2024-05-17 16:14:18 +08:00
cun-nan
7b5d47d115 bug 2024-05-17 16:08:44 +08:00
齐天大圣
9e2a581288 Merge remote-tracking branch 'origin/master' 2024-05-17 10:50:19 +08:00
齐天大圣
8759010ef0 优惠统计 2024-05-17 10:50:07 +08:00
wangh
764f01fd3d Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-16 14:27:26 +08:00
wangh
fd3d60adce 1 2024-05-16 14:27:22 +08:00
齐天大圣
8dad55a71a Merge remote-tracking branch 'origin/master' 2024-05-15 16:04:38 +08:00
齐天大圣
81f2dd4968 优惠统计 2024-05-15 16:04:27 +08:00
wangh
497fc5a6e7 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
 2024-05-13 14:21:18 +08:00
wangh
17a10d4f1b no message 2024-05-13 14:18:31 +08:00
齐天大圣
be2258b6c7 囤油锁价 2024-05-13 11:09:12 +08:00
齐天大圣
4dc581ef2b Merge remote-tracking branch 'origin/master' 2024-05-11 13:53:53 +08:00
齐天大圣
d4b8578e73 囤油锁价 2024-05-11 13:53:47 +08:00
齐天大圣
29e40a4132 囤油锁价 2024-05-11 08:38:33 +08:00
cun-nan
ff0af40e39 bug 2024-05-10 17:36:24 +08:00
齐天大圣
fa64cf61b6 囤油锁价 2024-05-10 17:28:09 +08:00
齐天大圣
88db1d93a0 囤油锁价 2024-05-10 17:25:54 +08:00
齐天大圣
2515d22ede Merge remote-tracking branch 'origin/master' 2024-05-10 16:54:19 +08:00
齐天大圣
44a1a82b81 囤油锁价 2024-05-10 16:54:08 +08:00
cun-nan
ba88d5bda1 bug 2024-05-10 11:54:12 +08:00
wangh
ef49ddc855 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-08 16:37:29 +08:00
wangh
54ba73dae3 no message 2024-05-08 16:29:05 +08:00
齐天大圣
7bb6e6dcc5 Merge remote-tracking branch 'origin/master' 2024-05-08 11:14:25 +08:00
齐天大圣
a7fb4a6d08 登录bug 2024-05-08 11:14:16 +08:00
wangh
73edd03038 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-08 09:03:56 +08:00
wangh
02c9f2c113 打印机对接 2024-05-08 09:03:51 +08:00
cun-nan
519848f5bb bug 2024-05-08 08:55:23 +08:00
齐天大圣
cfec1751bb 登录bug 2024-04-30 16:11:09 +08:00
齐天大圣
5a10249514 登录bug 2024-04-30 09:56:13 +08:00
齐天大圣
382ac53cc1 核销bug 2024-04-29 17:57:39 +08:00
齐天大圣
a45fde5373 核销bug 2024-04-29 16:55:31 +08:00
齐天大圣
3e51cf1e03 支付bug 2024-04-28 17:09:01 +08:00
齐天大圣
59065d2c00 优惠券bug 2024-04-28 12:04:22 +08:00
齐天大圣
28acf1ff82 积分变化 2024-04-28 10:32:06 +08:00
齐天大圣
faa7a57288 加油次数 2024-04-28 09:30:43 +08:00
齐天大圣
bdb0cc45fe bug 2024-04-28 09:17:05 +08:00
齐天大圣
ee9221494e bug 2024-04-28 09:16:14 +08:00
齐天大圣
bc13cc8d40 bug 2024-04-28 09:10:38 +08:00
齐天大圣
f0d00a61e1 bug 2024-04-26 13:42:56 +08:00
齐天大圣
8dcffd19a4 bug 2024-04-24 15:53:11 +08:00
齐天大圣
9e46716280 bug 2024-04-24 13:29:48 +08:00
齐天大圣
c5c7d7c7f5 bug 2024-04-10 22:27:32 +08:00
齐天大圣
25cf450810 bug 2024-04-10 16:39:29 +08:00
齐天大圣
46a0106ab7 bug 2024-04-09 16:01:14 +08:00
齐天大圣
62fec8eec4 bug 2024-04-09 09:37:17 +08:00
齐天大圣
15d263d203 bug 2024-04-09 09:23:11 +08:00
齐天大圣
edef89438d bug 2024-04-03 10:28:47 +08:00
齐天大圣
c2229eb228 bug 2024-04-02 17:23:09 +08:00
齐天大圣
c16d957e8e bug 2024-04-02 10:25:38 +08:00
齐天大圣
ee9fd4904b bug 2024-03-30 16:54:06 +08:00
齐天大圣
044cf386d5 bug 2024-03-30 16:53:20 +08:00
齐天大圣
d024f8b8d7 bug 2024-03-30 16:10:38 +08:00
齐天大圣
7c6a613e5e bug 2024-03-30 15:40:05 +08:00
齐天大圣
07d8762081 bug 2024-03-30 14:14:06 +08:00
齐天大圣
efa9d6057f bug 2024-03-29 16:58:57 +08:00
齐天大圣
bc01b68b65 bug 2024-03-29 15:56:55 +08:00
齐天大圣
3e05c8ce4d Merge remote-tracking branch 'origin/master' 2024-03-29 13:43:16 +08:00
齐天大圣
339e280c4d bug 2024-03-29 13:42:53 +08:00
cun-nan
60b52b53b3 bug 2024-03-29 13:18:58 +08:00
齐天大圣
74ffebbfce bug 2024-03-28 15:23:00 +08:00
齐天大圣
8213ccd1cc bug 2024-03-28 15:04:40 +08:00
齐天大圣
af93731749 bug 2024-03-28 15:04:24 +08:00
cun-nan
393629664a bug 2024-03-28 14:39:24 +08:00
齐天大圣
3a5c70f9cf bug 2024-03-28 10:17:11 +08:00
齐天大圣
24d5f29126 bug 2024-03-28 10:14:50 +08:00
齐天大圣
191eb1ae75 bug 2024-03-28 09:45:59 +08:00
齐天大圣
f367373055 bug 2024-03-27 16:39:03 +08:00
齐天大圣
9df392e6a0 bug 2024-03-27 16:38:47 +08:00
齐天大圣
b9e9256cf6 bug 2024-03-27 15:57:04 +08:00
齐天大圣
11327ccd9e bug 2024-03-27 15:56:39 +08:00
齐天大圣
2846701514 bug 2024-03-27 15:39:26 +08:00
齐天大圣
b9eadb12e6 bug 2024-03-27 14:48:43 +08:00
齐天大圣
c6568679f8 bug 2024-03-27 14:21:14 +08:00
齐天大圣
028beea5e6 bug 2024-03-27 14:07:57 +08:00
齐天大圣
ee190fdc01 bug 2024-03-27 14:07:27 +08:00
齐天大圣
7be624df45 bug 2024-03-27 13:21:43 +08:00
齐天大圣
b326483a68 bug 2024-03-27 11:31:44 +08:00
齐天大圣
75e32cdf09 bug 2024-03-27 11:30:07 +08:00
齐天大圣
26ffa0249d Merge remote-tracking branch 'origin/master' 2024-03-27 11:25:37 +08:00
齐天大圣
d31e230e8c bug 2024-03-27 11:24:51 +08:00
cun-nan
d573b39ae4 bug 2024-03-27 10:16:29 +08:00
齐天大圣
fa268dc54a bug 2024-03-27 09:42:45 +08:00
齐天大圣
aa585f42bf bug 2024-03-26 16:37:36 +08:00
齐天大圣
6ce42d3735 bug 2024-03-26 16:23:50 +08:00
齐天大圣
bcec199f5b bug 2024-03-26 16:12:44 +08:00
齐天大圣
cf1caaa4c5 bug 2024-03-26 13:33:23 +08:00
齐天大圣
44f2479074 bug 2024-03-25 16:46:21 +08:00
齐天大圣
cc3ce6f481 bug 2024-03-25 13:50:29 +08:00
齐天大圣
762545d1ee Merge remote-tracking branch 'origin/master' 2024-03-22 09:55:38 +08:00
齐天大圣
f97194b337 bug 2024-03-22 09:55:30 +08:00
cun-nan
8b009c34d5 bug 2024-03-20 13:23:03 +08:00
齐天大圣
72de644618 bug 2024-03-19 15:35:46 +08:00
齐天大圣
6b7658eb89 bug 2024-03-19 11:09:35 +08:00
齐天大圣
55be54b4ad bug 2024-03-19 09:38:34 +08:00
cun-nan
c25d20b87b bug 2024-03-18 17:40:39 +08:00
cun-nan
c4dda44f15 bug 2024-03-18 16:30:21 +08:00
cun-nan
613995dd4e bug 2024-03-18 15:26:11 +08:00
齐天大圣
1f2646bdfc bug 2024-03-18 14:56:57 +08:00
cun-nan
fac80c5b77 bug 2024-03-18 14:33:55 +08:00
cun-nan
8c86c0a780 bug 2024-03-18 09:54:31 +08:00
cun-nan
13211d382d bug 2024-03-18 09:03:14 +08:00
cun-nan
e2c8850da2 bug 2024-03-16 13:40:36 +08:00
齐天大圣
16d4da1f3d bug 2024-03-16 09:13:52 +08:00
cun-nan
c026b9e924 bug 2024-03-15 18:08:21 +08:00
齐天大圣
93af385295 Merge remote-tracking branch 'origin/master' 2024-03-15 17:43:51 +08:00
齐天大圣
fb0b03e596 bug 2024-03-15 17:43:39 +08:00
cun-nan
186cf48a2c bug 2024-03-15 17:41:54 +08:00
cun-nan
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
cun-nan
39b84372d9 bug 2024-03-15 14:57:29 +08:00
cun-nan
349668eaaa bug 2024-03-15 14:39:47 +08:00
cun-nan
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
cun-nan
a3a532faaf bug 2024-03-15 10:44:21 +08:00
cun-nan
39f2709f54 bug 2024-03-15 09:40:01 +08:00
cun-nan
d85a897b5c bug 2024-03-15 09:30:28 +08:00
cun-nan
98406ae1b4 bug 2024-03-15 09:01:19 +08:00
cun-nan
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
cun-nan
b1d49e4ece bug 2024-03-14 15:39:19 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
62df5c5533 bug 2024-03-13 16:43:30 +08:00
齐天大圣
785bb0b3b8 bug 2024-03-13 16:43:28 +08:00
cun-nan
d90ed73ed5 bug 2024-03-13 16:43:23 +08:00
cun-nan
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
cun-nan
5282713b98 bug 2024-03-13 15:40:48 +08:00
齐天大圣
854a3242bb bug 2024-03-13 11:18:21 +08:00
cun-nan
de79de4b58 bug 2024-03-13 10:59:27 +08:00
cun-nan
26c8c6544e bug 2024-03-13 10:09:10 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
cad70e53c6 bug 2024-03-12 09:55:14 +08:00
cun-nan
094804d122 bug 2024-03-11 18:05:45 +08:00
cun-nan
80f87ca256 bug 2024-03-11 17:11:47 +08:00
cun-nan
444cf4952d bug 2024-03-11 15:06:04 +08:00
cun-nan
446cab6fb5 bug 2024-03-11 14:37:09 +08:00
齐天大圣
e9a65f91dd bug 2024-03-11 14:07:54 +08:00