|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f2cf5bffdb
|
bug
|
2024-05-28 14:06:53 +08:00 |
|
|
|
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 |
|
|
|
dfce05d949
|
bug
|
2024-05-27 16:56:51 +08:00 |
|
|
|
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 |
|
|
|
3b86da3ef5
|
bug
|
2024-05-24 16:44:13 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
