Commit Graph

156 Commits

Author SHA1 Message Date
许允枞
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
de3013171f Merge remote-tracking branch 'origin/main' 2024-09-24 16:30:56 +08:00
a68677f0b8 9.24 2024-09-24 16:30:49 +08:00
许允枞
cbf3b0e15a 更新9.24 2024-09-24 16:19:17 +08:00
许允枞
4e4621e815 更新9.24 2024-09-24 11:23:34 +08:00
许允枞
eb127ee084 更新9.24 2024-09-24 10:50:47 +08:00
许允枞
3cd4b240c7 更新9.23 2024-09-23 16:05:05 +08:00
许允枞
b9036b8725 更新9.23 2024-09-23 13:43:59 +08:00
Vinjor
c7be416570 收银台优惠活动查询 2024-09-22 20:24:44 +08:00
Vinjor
a352d84ed6 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-22 18:53:19 +08:00
Vinjor
8c5c07aa0e 收银台 2024-09-22 18:53:15 +08:00
0417b46d55 处理数据 2024-09-22 18:34:17 +08:00
Vinjor
6168a1d29c 收银台 2024-09-22 17:33:14 +08:00
Vinjor
f7f711e3f2 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/src/api/newHome/newHome.js
2024-09-22 17:32:26 +08:00
Vinjor
aa58951e10 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
2024-09-22 16:37:43 +08:00
05c1363139 处理数据 2024-09-22 16:37:06 +08:00
Vinjor
f71acc410c 收银行查询逻辑 2024-09-22 14:57:08 +08:00
297d52e5ea 9.22 2024-09-22 14:16:55 +08:00
许允枞
7ab5ae5121 更新9.21 2024-09-21 18:38:23 +08:00
许允枞
1f6b51ae20 更新9.21 2024-09-21 17:16:01 +08:00
许允枞
6d59ca8743 更新9.21 2024-09-21 16:20:21 +08:00
6535769db2 9.21 2024-09-21 15:55:14 +08:00