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

1024 Commits

Author SHA1 Message Date
cun-nan
926d47c97f bug 2024-07-04 08:41:20 +08:00
cun-nan
0f971b096e bug 2024-07-03 15:01:14 +08:00
DESKTOP-369JRHT\12997
1b931f6c2d no message 2024-07-03 10:35:23 +08:00
xvv
503f1f4f73 前端 2024-06-19 14:40:54 +08:00
齐天大圣
b724be310e 订单bug 2024-06-14 10:04:25 +08:00
齐天大圣
e6d42baa84 Merge remote-tracking branch 'origin/master' 2024-06-12 16:29:35 +08:00
齐天大圣
af9e4836c2 小程序支付bug 2024-06-12 16:29:28 +08:00
cun-nan
deb613b44e bug 2024-06-12 16:21:04 +08:00
cun-nan
c309d2bf72 bug 2024-06-12 11:16:37 +08:00
DESKTOP-369JRHT\12997
7c71c1f2de Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	pos-uni/config.js
 2024-06-11 17:30:57 +08:00
DESKTOP-369JRHT\12997
a4411ed619 no message 2024-06-11 17:29:44 +08:00
齐天大圣
93b5665bb9 小程序支付bug 2024-06-11 14:32:22 +08:00
齐天大圣
40a882e898 Merge remote-tracking branch 'origin/master' 2024-06-06 17:38:23 +08:00
齐天大圣
d6cdb0c274 小程序支付bug 2024-06-06 17:38:15 +08:00
DESKTOP-369JRHT\12997
254dc19dad Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-06-06 17:16:26 +08:00
DESKTOP-369JRHT\12997
2e7f18845a no message 2024-06-06 17:16:22 +08:00
齐天大圣
b6fda98814 Merge remote-tracking branch 'origin/master' 2024-06-06 17:08:03 +08:00
齐天大圣
69dbe233cf 小程序支付bug 2024-06-06 17:07:07 +08:00
DESKTOP-369JRHT\12997
34854109bf Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java
 2024-06-06 11:56:42 +08:00
DESKTOP-369JRHT\12997
5a794a225d no message 2024-06-06 11:50:31 +08:00
cun-nan
a73308f067 bug 2024-06-06 11:49:38 +08:00
齐天大圣
c18c1f976b Merge remote-tracking branch 'origin/master' 2024-06-06 09:51:53 +08:00
齐天大圣
fcf5d4b06c 小程序支付bug 2024-06-06 08:35:59 +08:00
cun-nan
ca020b8c2a Merge remote-tracking branch 'origin/master' 2024-06-05 17:39:06 +08:00
cun-nan
9335d317a7 bug 2024-06-05 17:38:30 +08:00
齐天大圣
16c93fbdd2 Merge remote-tracking branch 'origin/master' 2024-06-05 17:33:44 +08:00
齐天大圣
c0ef041238 小程序支付bug 2024-06-05 17:33:31 +08:00
DESKTOP-369JRHT\12997
791e98aa14 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintCashierWeb/.env.development
 2024-06-05 17:31:04 +08:00
DESKTOP-369JRHT\12997
3aea665caa no message 2024-06-05 17:22:15 +08:00
齐天大圣
8d985addf8 小程序支付bug 2024-06-05 16:29:11 +08:00
齐天大圣
a89a6c5c27 小程序支付bug 2024-06-05 15:18:27 +08:00
齐天大圣
7c5c6a7088 pos支付bug 2024-06-05 14:47:06 +08:00
DESKTOP-369JRHT\12997
cb39d52efe no message 2024-06-05 14:24:00 +08:00
齐天大圣
fe788d418a pos支付bug 2024-06-05 11:51:31 +08:00
齐天大圣
79bc179929 Merge remote-tracking branch 'origin/master' 2024-06-04 16:32:18 +08:00
齐天大圣
71df91b54a pos支付bug 2024-06-04 16:32:09 +08:00
DESKTOP-369JRHT\12997
c6771e52af Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-06-04 16:15:36 +08:00
DESKTOP-369JRHT\12997
f58d384840 no message 2024-06-04 16:15:30 +08:00
齐天大圣
5324586116 pos支付bug 2024-06-04 15:44:41 +08:00
齐天大圣
566a81a1e6 pos支付bug 2024-06-04 15:06:56 +08:00
齐天大圣
998109913b pos支付bug 2024-06-04 14:27:23 +08:00
齐天大圣
6c4bfeaac4 收款bug 2024-06-04 11:50:41 +08:00
齐天大圣
1f9f076cc1 pos支付bug 2024-06-03 18:12:12 +08:00
DESKTOP-369JRHT\12997
8bcf58ca2b Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
 2024-06-03 09:12:52 +08:00
齐天大圣
5419d6bf53 Merge remote-tracking branch 'origin/master' 2024-06-03 08:40:24 +08:00
齐天大圣
ccde099d3d bug 2024-06-03 08:40:17 +08:00
DESKTOP-369JRHT\12997
b0d060edf0 no message 2024-05-31 18:15:41 +08:00
DESKTOP-369JRHT\12997
4b7a37f890 no message 2024-05-31 10:37:17 +08:00
DESKTOP-369JRHT\12997
e2f89bd897 no message 2024-05-31 09:10:41 +08:00
DESKTOP-369JRHT\12997
67723cf45e no message 2024-05-31 09:06:45 +08:00
cun-nan
6e5addb78c Merge remote-tracking branch 'origin/master' 2024-05-31 09:01:29 +08:00
cun-nan
4cb73620e1 bug 2024-05-31 09:01:18 +08:00
DESKTOP-369JRHT\12997
1c3248a275 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-31 08:54:03 +08:00
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
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