Commit Graph

1457 Commits

Author SHA1 Message Date
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
xvv
7184a4490b pos 端 2024-05-27 15:16:13 +08:00
xvv
9eef3877a1 pos 端 2024-05-27 15:15:43 +08:00
DESKTOP-369JRHT\12997
8a6a373981 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-27 08:46:15 +08:00
DESKTOP-369JRHT\12997
26ac5de97a Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-27 08:45:39 +08:00
DESKTOP-369JRHT\12997
18c1aa3843 no message 2024-05-27 08:45:36 +08:00
DESKTOP-369JRHT\12997
2e09afefa7 no message 2024-05-27 08:45:03 +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
xvv
891d047581 Merge remote-tracking branch 'origin/master' 2024-05-23 11:54:39 +08:00
xvv
e33c46cd81 pos 端 2024-05-23 11:51:11 +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
1b2af2f8a2 bug 2024-05-23 09:26:04 +08:00
wangh
14a3c56a73 no message 2024-05-23 09:18:59 +08:00
wangh
3acbf2bcda no message 2024-05-23 09:03:06 +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
a3727051e7 no message 2024-05-22 17:13:47 +08:00
wangh
ed7538594e no message 2024-05-22 17:13:13 +08:00
wangh
963c46324c no message 2024-05-22 17:12:19 +08:00
513948427c bug 2024-05-22 14:27:40 +08:00
xvv
a8b890e4ff Merge remote-tracking branch 'origin/master' 2024-05-22 09:40:06 +08:00
xvv
5211e8750e pos 端 2024-05-22 09:39:54 +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