Commit Graph

109 Commits

Author SHA1 Message Date
18d96bb254 Merge remote-tracking branch 'origin/master' 2024-01-13 13:50:29 +08:00
7d9d150c38 修改bug 2024-01-13 13:50:18 +08:00
wangh
0ed07ccd49 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 13:24:02 +08:00
77df396e46 Merge remote-tracking branch 'origin/master' 2024-01-13 13:22:42 +08:00
0163084c13 修改bug 2024-01-13 13:22:33 +08:00
wangh
5d9de0a0dc bug修改 2024-01-13 13:22:10 +08:00
399cf05de6 bug 2024-01-13 13:13:18 +08:00
94b0dacae7 bug 2024-01-13 11:53:00 +08:00
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
wangh
873825c669 no message 2024-01-12 17:08:26 +08:00
db6d7f9c85 bug 2024-01-12 17:03:22 +08:00
66585d6d2c bug 2024-01-12 15:41:37 +08:00
288de2b8ba bug 2024-01-12 15:29:24 +08:00
@QQNZX
0d653b93e3 前端 2024-01-12 14:47:14 +08:00
wangh
250f000040 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-12 13:58:57 +08:00
wangh
dde91a7108 中台增加订单 2024-01-12 13:58:51 +08:00
4ed6ba6e8c bug 2024-01-12 13:55:40 +08:00
654d912ef1 bug 2024-01-12 13:26:22 +08:00
7c512e33aa bug 2024-01-11 18:08:12 +08:00
2a9b7cae2e bug 2024-01-11 13:55:20 +08:00
c3e633ca43 优化项 2024-01-08 18:26:49 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
5979294f18 优化项 2024-01-06 15:47:07 +08:00
wangh
214ab014ec Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintAdmin/.env.development
#	fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
2024-01-06 15:13:27 +08:00
wangh
e267ba63fe bug修改 2024-01-06 15:06:58 +08:00
683b41e456 优化项 2024-01-06 13:37:21 +08:00
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-05 14:30:27 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
830e435b56 子卡信息 2023-12-28 17:31:50 +08:00
cd24222c2a 子卡信息 2023-12-28 13:14:35 +08:00
323add1517 会员信息 2023-12-27 18:44:56 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
217c669407 订单信息 2023-12-13 18:43:50 +08:00
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
@QQNZX
3e22074fa1 12.05前端 2023-12-05 11:41:42 +08:00
0416cb19d0 会员信息 2023-12-04 16:35:09 +08:00
wangh
81749b3388 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-01 15:42:28 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
cec9d85b3a 收银台 2023-11-28 18:33:35 +08:00
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00