Commit Graph

177 Commits

Author SHA1 Message Date
PQZ
05a6fafbd1 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-09-30 17:31:18 +08:00
PQZ
f8c76ba0de 1 2024-09-30 17:31:15 +08:00
许允枞
8698bf01a1 更新9.30 2024-09-30 16:54:06 +08:00
许允枞
976ca57b71 更新9.30 2024-09-30 15:05:34 +08:00
许允枞
c802e9ea0a 更新9.30 2024-09-30 11:45:40 +08:00
DESKTOP-369JRHT\12997
712310817a 9.30 2024-09-30 10:30:55 +08:00
许允枞
654545c8a7 更新9.29 2024-09-29 18:02:39 +08:00
许允枞
1e770c2003 更新9.29 2024-09-29 15:16:57 +08:00
许允枞
ee46331d8d 更新9.29 2024-09-29 15:11:04 +08:00
许允枞
3817350e1d 更新9.29 2024-09-29 14:57:57 +08:00
许允枞
029cb2d6f4 更新9.29 2024-09-29 13:59:54 +08:00
8f34536411 9.29 2024-09-29 11:20:08 +08:00
许允枞
2176938b4e 更新9.28 2024-09-28 18:08:43 +08:00
许允枞
e2c8c18a3c 更新9.28 2024-09-28 13:50:54 +08:00
许允枞
8d702bc6e4 更新9.28 2024-09-28 11:30:25 +08:00
许允枞
b8bdbaab89 更新9.28 2024-09-28 10:31:40 +08:00
许允枞
bba101f127 更新9.28 2024-09-28 10:04:38 +08:00
许允枞
4b735e02ce 更新9.28 2024-09-28 09:33:14 +08:00
dc7e6e1cbd 9.27 2024-09-27 17:33:11 +08:00
许允枞
d0d804734b 更新9.27 2024-09-27 17:30:52 +08:00
许允枞
c5f27ed0f9 更新9.27 2024-09-27 15:12:47 +08:00
许允枞
e425475bde 更新9.27 2024-09-27 11:49:38 +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
许允枞
aebd7f67d3 更新9.26 2024-09-26 18:09:51 +08:00
2ec927d3b0 9.26 2024-09-26 17:58:06 +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
3f93dd7ade 营销活动 2024-09-26 15:19:59 +08:00
zhaohengkun
c274a7f9e1 后端 BUG 2024-09-26 14:52:54 +08:00
许允枞
eef9acc901 更新9.26 2024-09-26 13:54:33 +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
cfb12b40e0 9.25 2024-09-25 16:17:44 +08:00
Vinjor
67793a651b 收银台 2024-09-25 14:22:06 +08:00
zhaotianfeng
8cc44016d7 修改bug 2024-09-25 11:53:05 +08:00
许允枞
57c3422180 更新9.24 2024-09-24 18:27:48 +08:00
e77c15db19 提交 2024-09-24 17:24:39 +08:00
许允枞
c7670d1b27 更新9.24 2024-09-24 17:04:37 +08:00
d6b86ab8e4 9.24 2024-09-24 16:49:13 +08:00