Commit Graph

409 Commits

Author SHA1 Message Date
DESKTOP-369JRHT\12997
8cea951790 9.27 2024-09-27 14:10:40 +08:00
许允枞
e425475bde 更新9.27 2024-09-27 11:49:38 +08:00
zhaohengkun
173af4884a 前端BUG 2024-09-27 11:15:39 +08:00
zhaohengkun
f2a7cd7b1a Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-27 11:12:19 +08:00
zhaohengkun
2d279e136e 后端 BUG 2024-09-27 11:11:58 +08:00
许允枞
721d954017 更新9.27 2024-09-27 10:34:28 +08:00
1969b5c0db 9.27 2024-09-27 10:20:09 +08:00
Vinjor
d0e3751aac Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
2024-09-27 10:10:29 +08:00
Vinjor
21e34c8ebe 收银台 2024-09-27 10:05:48 +08:00
许允枞
3653651021 更新9.27 2024-09-27 09:56:07 +08:00
DESKTOP-369JRHT\12997
b5ee5634d7 9.27 2024-09-27 09:23:47 +08:00
许允枞
aebd7f67d3 更新9.26 2024-09-26 18:09:51 +08:00
2ec927d3b0 9.26 2024-09-26 17:58:06 +08:00
PQZ
6a95c2833a 1 2024-09-26 17:19:45 +08:00
PQZ
75815cf4b0 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-09-26 17:13:54 +08:00
PQZ
1c6df767a5 适用商品 2024-09-26 17:13:51 +08:00
许允枞
513f5ab42f 更新9.26 2024-09-26 16:47:47 +08:00
zhaohengkun
89e1f60ac7 后端 BUG 2024-09-26 16:37:15 +08:00
zhaohengkun
85d1a9c1f3 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-26 16:36:07 +08:00
zhaohengkun
2d13b1409e 前端BUG 2024-09-26 16:35:46 +08:00
xvv
21195ccf2a 9.26 2024-09-26 15:23:18 +08:00
3f93dd7ade 营销活动 2024-09-26 15:19:59 +08:00
zhaohengkun
c274a7f9e1 后端 BUG 2024-09-26 14:52:54 +08:00
zhaohengkun
1ee96d674e Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-26 14:48:58 +08:00
zhaohengkun
5d48b8e8e9 前端BUG 2024-09-26 14:48:34 +08:00
80c27908de 9.26 2024-09-26 14:39:28 +08:00
许允枞
eef9acc901 更新9.26 2024-09-26 13:54:33 +08:00
bff50c9f3b Merge remote-tracking branch 'origin/main' 2024-09-26 13:46:09 +08:00
cc2c326072 9.26 2024-09-26 13:45:57 +08:00
Vinjor
e71c53ef96 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-26 13:45:56 +08:00
Vinjor
0f2503f73a 收银台 2024-09-26 13:45:48 +08:00
许允枞
8a545140a4 更新9.26 2024-09-26 11:08:43 +08:00
许允枞
58cb379326 更新9.25 2024-09-25 18:05:55 +08:00
许允枞
23663fabc2 更新9.25 2024-09-25 17:49:43 +08:00
734e0223ed Merge remote-tracking branch 'origin/main' 2024-09-25 16:56:53 +08:00
c56a065fa1 9.25 2024-09-25 16:56:41 +08:00
DESKTOP-369JRHT\12997
7107bee0ea 单独的一个页 2024-09-25 16:25:10 +08:00
cfb12b40e0 9.25 2024-09-25 16:17:44 +08:00
563bb48cea 营销活动 2024-09-25 15:56:24 +08:00
3a7417af29 9.25 2024-09-25 15:31:59 +08:00
2c40ca4134 9.25 2024-09-25 15:10:46 +08:00
zhaohengkun
72bbbaa2bb Merge remote-tracking branch 'origin/main' 2024-09-25 14:56:48 +08:00
zhaohengkun
c5068f7ea1 修改bug 2024-09-25 14:56:16 +08:00
Vinjor
67793a651b 收银台 2024-09-25 14:22:06 +08:00
zhaotianfeng
26df427f9a 修改 2024-09-25 12:00:15 +08:00
zhaotianfeng
3327bece3c Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-25 11:54:09 +08:00
zhaotianfeng
6833b81a2b 修改bug 2024-09-25 11:53:41 +08:00
zhaotianfeng
8cc44016d7 修改bug 2024-09-25 11:53:05 +08:00
Vinjor
50638b0da4 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/.env.development
2024-09-25 11:24:49 +08:00
Vinjor
6eca7526ce 1 2024-09-25 11:23:32 +08:00