|
|
6e5addb78c
|
Merge remote-tracking branch 'origin/master'
|
2024-05-31 09:01:29 +08:00 |
|
|
|
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
|
6ad75e4d1f
|
no message
|
2024-05-31 08:53:59 +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 |
|
|
|
ef215ce5b1
|
Merge remote-tracking branch 'origin/master'
|
2024-05-30 16:09:47 +08:00 |
|
|
|
6ed397b99b
|
bug
|
2024-05-30 16:09:39 +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 |
|
|
|
350570a56c
|
Merge remote-tracking branch 'origin/master'
|
2024-05-29 17:42:17 +08:00 |
|
|
|
49666799a4
|
bug
|
2024-05-29 17:42:11 +08:00 |
|
|
|
a7792e4b20
|
bug
|
2024-05-29 17:37:23 +08:00 |
|
|
|
6741e6ec86
|
Merge remote-tracking branch 'origin/master'
|
2024-05-29 17:24:06 +08:00 |
|
|
|
827cb66e35
|
bug
|
2024-05-29 17:24:00 +08:00 |
|
xvv
|
946815ef2e
|
pos 端
|
2024-05-29 15:34: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 |
|
|
|
fd2fc185f9
|
Merge remote-tracking branch 'origin/master'
|
2024-05-29 15:00:41 +08:00 |
|
|
|
5511d2c00a
|
消息通知去除
|
2024-05-29 15:00:12 +08:00 |
|
xvv
|
5394e4969b
|
pos 端
|
2024-05-29 14:07:07 +08:00 |
|
|
|
0fcf535c1d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pos-uni/pagesHome/CardPayment/CardPayment.vue
|
2024-05-29 13:54:20 +08:00 |
|
|
|
96fe1682b2
|
bug
|
2024-05-29 13:53:49 +08:00 |
|
xvv
|
d397140572
|
pos 端
|
2024-05-29 13:53:09 +08:00 |
|
|
|
71ff8fc6da
|
bug
|
2024-05-29 13:41:30 +08:00 |
|
|
|
70d1a50a04
|
bug
|
2024-05-29 11:05:24 +08:00 |
|
|
|
39d6919db3
|
pos首页前三个订单
|
2024-05-29 10:28:39 +08:00 |
|
xvv
|
d36c077bea
|
Merge remote-tracking branch 'origin/master'
|
2024-05-28 14:28:44 +08:00 |
|
xvv
|
e5f79d46d0
|
pos 端
|
2024-05-28 14:28:36 +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 |
|
xvv
|
1ea3d5e56c
|
pos 端
|
2024-05-28 10:12:15 +08:00 |
|
xvv
|
79aa0d7268
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pos-uni/pages/index/index.vue
|
2024-05-28 09:34:27 +08:00 |
|
xvv
|
62bce4739d
|
pos 端
|
2024-05-28 09:34:09 +08:00 |
|
|
|
03be0bf0cf
|
bug
|
2024-05-28 09:11:12 +08:00 |
|
|
|
6a20bf7df3
|
bug
|
2024-05-28 09:07:24 +08:00 |
|
DESKTOP-369JRHT\12997
|
ed1c6f998e
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
# Conflicts:
# pos-uni/pagesHome/BusinessData/BusinessData.vue
|
2024-05-28 09:03:32 +08:00 |
|
DESKTOP-369JRHT\12997
|
f88ea4af5c
|
no message
|
2024-05-28 09:02:34 +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 |
|
|
|
6eb9d49679
|
bug
|
2024-05-27 17:11:57 +08:00 |
|
|
|
19b64ad695
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pos-uni/pages.json
# pos-uni/pagesHome/Collection/Collection.vue
|
2024-05-27 17:00:09 +08:00 |
|
|
|
dfce05d949
|
bug
|
2024-05-27 16:56:51 +08:00 |
|
xvv
|
1a012feb23
|
pos 端
|
2024-05-27 16:43:09 +08:00 |
|
