|
|
461965c760
|
Merge remote-tracking branch 'origin/main'
|
2024-11-01 08:22:24 +08:00 |
|
|
|
a58892a2da
|
Merge remote-tracking branch 'origin/main'
|
2024-10-31 17:54:28 +08:00 |
|
|
|
ca88835387
|
10.31
|
2024-10-31 17:53:24 +08:00 |
|
zhaohengkun
|
540f66bd15
|
1
|
2024-10-31 17:53:09 +08:00 |
|
|
|
32d774dc27
|
1
|
2024-10-31 15:58:43 +08:00 |
|
|
|
6ea3834783
|
10.31
|
2024-10-31 15:54:59 +08:00 |
|
|
|
1b09dab46f
|
10.31
|
2024-10-31 14:48:14 +08:00 |
|
zhaohengkun
|
261d559f1a
|
bug修改
|
2024-10-31 14:44:57 +08:00 |
|
|
|
28f27d415c
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
# fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
|
2024-10-31 11:20:08 +08:00 |
|
|
|
9662e2951c
|
1
|
2024-10-31 11:17:58 +08:00 |
|
|
|
2246eca9ee
|
1
|
2024-10-31 10:28:37 +08:00 |
|
|
|
2c68d58198
|
1
|
2024-10-31 10:20:48 +08:00 |
|
zhaohengkun
|
c08ad40842
|
1
|
2024-10-31 10:02:33 +08:00 |
|
|
|
f9edc8af57
|
1
|
2024-10-31 09:22:23 +08:00 |
|
|
|
1d407ffa3f
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
# fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
|
2024-10-31 08:46:31 +08:00 |
|
|
|
207ecefc50
|
10.30
|
2024-10-30 15:52:14 +08:00 |
|
zhaohengkun
|
557d377ef5
|
1
|
2024-10-30 14:38:47 +08:00 |
|
|
|
4e3d502ae5
|
收银台打印小票
|
2024-10-30 14:28:13 +08:00 |
|
|
|
1a61e3aef9
|
10.30
|
2024-10-30 11:16:16 +08:00 |
|
ds
|
6298e9249f
|
10.30
|
2024-10-30 11:00:37 +08:00 |
|
|
|
a5fc7fbe9a
|
Merge remote-tracking branch 'origin/main'
|
2024-10-30 10:30:27 +08:00 |
|
|
|
9bd50d00d5
|
10.29
|
2024-10-29 17:29:49 +08:00 |
|
zhaohengkun
|
839c5f5226
|
1
|
2024-10-29 16:09:01 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
dc6551a581
|
10.29
|
2024-10-29 10:21:37 +08:00 |
|
|
|
5179ad290f
|
10.28
|
2024-10-28 18:33:45 +08:00 |
|
|
|
4f9479c799
|
10.28
|
2024-10-28 11:33:35 +08:00 |
|
|
|
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 |
|
|
|
73576a54ae
|
10.25
|
2024-10-25 17:51:00 +08:00 |
|
|
|
42b9df78a8
|
10.25
|
2024-10-25 16:41:51 +08:00 |
|
|
|
3937a4d0f2
|
10.25
|
2024-10-25 14:56:56 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
