|
|
7160b12ab4
|
bug
|
2024-06-04 16:14:29 +08:00 |
|
|
|
5d76fb1352
|
Merge remote-tracking branch 'origin/master'
|
2024-06-04 15:45:42 +08:00 |
|
|
|
4c8f2f0f6c
|
bug
|
2024-06-04 15:45:32 +08:00 |
|
|
|
2f46dc8974
|
Merge remote-tracking branch 'origin/master'
|
2024-06-04 15:44:52 +08:00 |
|
|
|
5324586116
|
pos支付bug
|
2024-06-04 15:44:41 +08:00 |
|
|
|
9b6124594a
|
Merge remote-tracking branch 'origin/master'
|
2024-06-04 15:20:18 +08:00 |
|
|
|
279f19a360
|
bug
|
2024-06-04 15:20:03 +08:00 |
|
|
|
566a81a1e6
|
pos支付bug
|
2024-06-04 15:06:56 +08:00 |
|
|
|
bb36e6402c
|
手机号限制bug
|
2024-06-04 14:36:20 +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 |
|
DESKTOP-369JRHT\12997
|
0bdab08eb0
|
no message
|
2024-06-03 09:11:24 +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
|
e622f88454
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
|
2024-05-31 10:37:20 +08:00 |
|
DESKTOP-369JRHT\12997
|
4b7a37f890
|
no message
|
2024-05-31 10:37:17 +08:00 |
|
|
|
71e1606fa6
|
bug
|
2024-05-31 09:29:30 +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 |
|
|
|
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 |
|
