Commit Graph

51 Commits

Author SHA1 Message Date
c076b07a83 优化项 2024-01-10 11:06:41 +08:00
6b6ae15cb1 优化项 2024-01-09 11:27:55 +08:00
418ec4a863 优化项 2024-01-09 11:26:55 +08:00
c3e633ca43 优化项 2024-01-08 18:26:49 +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
eae119f033 优化项 2024-01-05 18:27:59 +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
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
a5d998b02d 满减 2023-12-29 15:27:06 +08:00
cd24222c2a 子卡信息 2023-12-28 13:14:35 +08:00
323add1517 会员信息 2023-12-27 18:44:56 +08:00
wangh
c9dbe51f22 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-27 09:11:48 +08:00
wangh
0f7c14444d 完善站长一键登录+修改中台出现的bug 2023-12-27 09:11:43 +08:00
53288a6e77 意见反馈 2023-12-26 18:44:50 +08:00
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
24716f59be 正在使用的商户状态 2023-12-25 11:17:36 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
wangh
8148002ce2 no message 2023-12-22 18:18:21 +08:00
b9bac4a4b0 小程序支付 2023-12-22 16:33:34 +08:00
8a3ee12f1d 小程序支付 2023-12-20 16:04:56 +08:00
2c4febc2b7 订单信息 2023-12-14 15:06:24 +08:00
33cfff8e8b 订单信息 2023-12-14 11:04:16 +08:00
217c669407 订单信息 2023-12-13 18:43:50 +08:00
4599d08df9 订单信息 2023-12-08 15:48:54 +08:00
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
302a7850fe 收银台 2023-11-23 18:37:40 +08:00
wangh
174bfee9d5 bug修改 2023-11-21 18:11:49 +08:00
wangh
4ef7e1cdca Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintCashierWeb/.env.development
2023-11-16 18:42:37 +08:00
5bafce40c5 收银台 2023-11-15 18:48:07 +08:00
757d9c5adb 收银台 2023-11-14 19:00:25 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
4f69e72145 Merge remote-tracking branch 'origin/master' 2023-11-13 19:01:25 +08:00
f72db0c784 收银台 2023-11-13 18:59:13 +08:00
wangh
f2a65be97f 存油 2023-11-13 18:58:31 +08:00
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
c31617ed7f 收银台 2023-11-13 16:51:38 +08:00
79134699fd 收银台 2023-11-11 18:04:49 +08:00
c9c66c61dd 收银台 2023-11-11 13:54:24 +08:00