dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769 Commits 2 Branches 0 Tags 190 MiB
407425018b
Commit Graph

387 Commits

Author SHA1 Message Date
cun-nan
581cefa9b3 10.29 2024-10-29 15:40:39 +08:00
齐天大圣
5a5ec7c43c 收银台打印小票 2024-10-29 15:29:46 +08:00
齐天大圣
9a9ff1dca2 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
 2024-10-29 14:55:50 +08:00
cun-nan
17161700e0 10.29 2024-10-29 11:49:59 +08:00
zhaohengkun
05c85707dc 1 2024-10-29 11:41:06 +08:00
zhaohengkun
bafcf724f1 1 2024-10-29 11:35:05 +08:00
cun-nan
dc6551a581 10.29 2024-10-29 10:21:37 +08:00
cun-nan
5179ad290f 10.28 2024-10-28 18:33:45 +08:00
cun-nan
4f9479c799 10.28 2024-10-28 11:33:35 +08:00
cun-nan
45757fd59d 10.28 2024-10-28 10:36:06 +08:00
齐天大圣
202399cfbf 收银台打印小票 2024-10-28 09:26:02 +08:00
齐天大圣
3e812bd148 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
 2024-10-26 14:58:39 +08:00
齐天大圣
d479583f49 收银台打印小票 2024-10-26 14:57:28 +08:00
齐天大圣
2a3f80675e 收银台打印小票 2024-10-26 14:05:42 +08:00
ds
66e0810d56 10.25 2024-10-25 18:07:55 +08:00
cun-nan
73576a54ae 10.25 2024-10-25 17:51:00 +08:00
cun-nan
42b9df78a8 10.25 2024-10-25 16:41:51 +08:00
cun-nan
3937a4d0f2 10.25 2024-10-25 14:56:56 +08:00
cun-nan
130e8556ac 10.25 2024-10-25 13:46:53 +08:00
zhaohengkun
a25303b23a Merge remote-tracking branch 'origin/main' 2024-10-25 11:49:03 +08:00
zhaohengkun
2aa71233f3 1 2024-10-25 11:48:41 +08:00
ds
5541b75d61 10.24-现金支付时优惠券bug测试及修复 2024-10-25 11:41:50 +08:00
ds
383f52870b 10.24 2024-10-24 18:53:29 +08:00
zhaohengkun
f035fda9e1 bug 2024-10-24 18:10:18 +08:00
cun-nan
82bbcefc9c 10.24 2024-10-24 17:04:51 +08:00
ds
4cb9cb3692 收银系统-订单-后端功能 2024-10-24 17:01:00 +08:00
zhaohengkun
d0c8769c5d bug 2024-10-24 16:36:30 +08:00
cun-nan
846ce4c33f 10.24 2024-10-24 16:25:56 +08:00
cun-nan
0ca0656f4d 10.24 2024-10-24 15:39:10 +08:00
cun-nan
d18fa885f8 10.24 2024-10-24 11:44:23 +08:00
zhaohengkun
51bc0851f9 1 2024-10-24 10:10:25 +08:00
zhaohengkun
9eceda0858 bug 2024-10-24 09:30:33 +08:00
cun-nan
953c53696c 10.23 2024-10-23 17:12:34 +08:00
齐天大圣
1db289de63 后端修改小票配置打印和小票动态打印 2024-10-23 16:27:04 +08:00
cun-nan
5dec74f184 10.23 2024-10-23 15:43:06 +08:00
cun-nan
198c25ea5b 10.23 2024-10-23 11:13:47 +08:00
cun-nan
3a590eb4b3 10.23 2024-10-23 10:06:02 +08:00
zhaohengkun
8d28b9aef5 1 2024-10-23 09:07:36 +08:00
cun-nan
219dfa5cb4 10.22 2024-10-22 16:01:59 +08:00
zhaohengkun
ae9ee648c6 bug修改 2024-10-22 13:35:39 +08:00
zhaohengkun
75f2c2b3ad bug修改 2024-10-22 11:16:59 +08:00
DESKTOP-369JRHT\12997
b773788839 10.19 2024-10-19 18:03:31 +08:00
Lx
98d534976a Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
 2024-10-18 18:21:19 +08:00
Lx
435b10db7b 中台系统设置部分Bug；首页通知中心接口 2024-10-18 18:17:40 +08:00
zhaohengkun
3b2da37b27 1 2024-10-18 18:06:04 +08:00
cun-nan
2dfb19b84d 10.18 2024-10-18 17:10:18 +08:00
zhaohengkun
86b9c1997d 优惠券相关修改 2024-10-18 16:45:02 +08:00
cun-nan
cecae110c7 10.18 2024-10-18 11:03:09 +08:00
cun-nan
900b460852 10.18 2024-10-18 10:37:53 +08:00
zhaohengkun
a40e1e29e7 1 2024-10-18 10:03:47 +08:00
zhaohengkun
826fd38add 1 2024-10-18 09:47:34 +08:00
zhaohengkun
68a94aa3fc Merge remote-tracking branch 'origin/main' 2024-10-18 09:34:48 +08:00
zhaohengkun
e8a4da0826 BUG + 收银台调整 2024-10-18 09:33:26 +08:00
cun-nan
a7272a1b4f 10.18 2024-10-18 09:30:32 +08:00
Lx
eabfb9bd1f 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
Lx
e560658211 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
cun-nan
a9727156f7 10.17 2024-10-17 17:46:51 +08:00
cun-nan
8ab3e3780a 10.17 2024-10-17 15:48:58 +08:00
许允枞
4a4d53fcda 更新10.17 2024-10-17 11:36:29 +08:00
许允枞
4687084528 更新10.16 2024-10-16 18:28:23 +08:00
许允枞
250bf6cc09 更新10.16 2024-10-16 17:34:54 +08:00
许允枞
9cf48beb49 更新10.16 2024-10-16 16:39:57 +08:00
许允枞
cd626eb3eb 更新10.16 2024-10-16 16:28:13 +08:00
zhaohengkun
7b926e3713 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-16 16:17:42 +08:00
zhaohengkun
3276ced4ae bug1 2024-10-16 16:17:19 +08:00
许允枞
75cbf0af25 更新10.16 2024-10-16 16:05:03 +08:00
许允枞
cf5d8d46f7 更新10.16 2024-10-16 15:09:44 +08:00
许允枞
4bcc6fbe02 更新10.16 2024-10-16 14:05:40 +08:00
许允枞
b78e2a0f1d 更新10.16 2024-10-16 14:03:35 +08:00
许允枞
e28039b063 更新10.16 2024-10-16 13:58:42 +08:00
许允枞
c7f624f62a 更新10.16 2024-10-16 13:28:52 +08:00
许允枞
7287f92406 更新10.16 2024-10-16 13:11:01 +08:00
许允枞
5c3391599e 更新10.16 2024-10-16 12:38:22 +08:00
cun-nan
1da831fd2b 10.16 2024-10-16 11:31:40 +08:00
许允枞
9ad6fcb18d 更新10.16 2024-10-16 09:44:17 +08:00
zhaohengkun
8fe169815a Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-15 18:11:34 +08:00
zhaohengkun
0d42e10334 bug1 2024-10-15 18:11:07 +08:00
许允枞
a63a74a8ec 更新10.15 2024-10-15 15:04:18 +08:00
cun-nan
977648f815 10.15 2024-10-15 14:27:49 +08:00
许允枞
921b5666d5 更新10.15 2024-10-15 13:37:56 +08:00
许允枞
e52f64ab0d 更新10.14 2024-10-14 18:12:29 +08:00
cun-nan
681cfddf20 10.14 2024-10-14 18:00:48 +08:00
cun-nan
6d05996444 10.14 2024-10-14 16:34:11 +08:00
zhaohengkun
1aee452526 1 2024-10-14 16:32:01 +08:00
许允枞
f3229ce2ff 更新10.14 2024-10-14 16:12:59 +08:00
zhaohengkun
8696af8903 1 2024-10-14 15:10:00 +08:00
cun-nan
18f724d177 10.14 2024-10-14 14:56:04 +08:00
zhaohengkun
0edf36a6d3 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-14 14:50:56 +08:00
zhaohengkun
dea17c543e 1 2024-10-14 14:50:36 +08:00
许允枞
3cbed13ed9 更新10.12 2024-10-14 14:19:22 +08:00
cun-nan
254295a0c1 10.14 2024-10-14 14:11:37 +08:00
zhaohengkun
872cfdc423 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-12 18:11:56 +08:00
zhaohengkun
825f0f315b 1 2024-10-12 18:11:36 +08:00
许允枞
95d279653d 更新10.12 2024-10-12 18:09:59 +08:00
cun-nan
48f29f4873 10.12 2024-10-12 17:29:35 +08:00
许允枞
2e641eb0b3 更新10.12 2024-10-12 16:29:59 +08:00
许允枞
e38565cb38 更新10.12 2024-10-12 15:08:18 +08:00
DESKTOP-369JRHT\12997
fe5cf30c51 Merge remote-tracking branch 'origin/main' 2024-10-12 14:49:59 +08:00
DESKTOP-369JRHT\12997
bbce47dda1 10.11 2024-10-12 14:49:42 +08:00
许允枞
4f974132a9 更新10.12 2024-10-12 14:43:16 +08:00