Commit Graph

150 Commits

Author SHA1 Message Date
sw
28d72ff386 11.14 2024-11-14 09:16:39 +08:00
ds
994feb86fc 11.13 2024-11-13 15:00:25 +08:00
ds
ffb623b829 11 2024-11-12 08:42:57 +08:00
DESKTOP-369JRHT\12997
8bafad399c 11.11硬件商城 2024-11-11 11:27:25 +08:00
DESKTOP-369JRHT\12997
407425018b 11.11收银台订单边距调整 2024-11-11 10:11:50 +08:00
sw
c889354454 11.8 2024-11-08 09:45:44 +08:00
sw
57206c4ad6 油站财务报表,交易 2024-11-05 15:41:04 +08:00
zhaohengkun
3ccbd60e4f bug修改 2024-11-04 10:42:04 +08:00
xvv
62c20b2c15 11.2 2024-11-02 17:04:05 +08:00
0f8a9058cf Merge remote-tracking branch 'origin/main' 2024-11-02 08:31:22 +08:00
DESKTOP-369JRHT\12997
cf6755b3c8 11.1 2024-11-01 10:37:08 +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
zhaohengkun
c08ad40842 1 2024-10-31 10:02:33 +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
zhaohengkun
7a045a9e71 1 2024-10-30 11:29:09 +08:00
a5fc7fbe9a Merge remote-tracking branch 'origin/main' 2024-10-30 10:30:27 +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
zhaohengkun
bafcf724f1 1 2024-10-29 11:35:05 +08:00
ds
1d27ad0873 10.28 2024-10-28 18:02:31 +08:00
45757fd59d 10.28 2024-10-28 10:36:06 +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
2a3f80675e 收银台打印小票 2024-10-26 14:05:42 +08:00
zhaohengkun
2aa71233f3 1 2024-10-25 11:48:41 +08:00
zhaohengkun
f035fda9e1 bug 2024-10-24 18:10:18 +08:00
ds
4cb9cb3692 收银系统-订单-后端功能 2024-10-24 17:01:00 +08:00
zhaohengkun
d0c8769c5d bug 2024-10-24 16:36:30 +08:00
d18fa885f8 10.24 2024-10-24 11:44:23 +08:00
zhaohengkun
9eceda0858 bug 2024-10-24 09:30:33 +08:00
zhaohengkun
8d28b9aef5 1 2024-10-23 09:07:36 +08:00
219dfa5cb4 10.22 2024-10-22 16:01:59 +08:00
zhaohengkun
ae9ee648c6 bug修改 2024-10-22 13:35:39 +08:00
4e676c7e8b 10.22 2024-10-22 11:42:51 +08:00
zhaohengkun
75f2c2b3ad bug修改 2024-10-22 11:16:59 +08:00
e7b2df5001 10.22 2024-10-22 11:10:03 +08:00
9de246a8e5 10.22 2024-10-22 10:42:47 +08:00
9741831c8d Merge remote-tracking branch 'origin/main' 2024-10-22 10:30:12 +08:00
0d5d6ff11d 10.22 2024-10-22 10:29:38 +08:00
DESKTOP-369JRHT\12997
b897fa3629 10.22 2024-10-22 10:29:38 +08:00
DESKTOP-369JRHT\12997
cdb9262c12 10.22 2024-10-22 10:05:09 +08:00
zhaohengkun
0d952a0082 活动相关调整 2024-10-21 10:47:57 +08:00
DESKTOP-369JRHT\12997
b773788839 10.19 2024-10-19 18:03:31 +08:00
2dfb19b84d 10.18 2024-10-18 17:10:18 +08:00
zhaohengkun
86b9c1997d 优惠券相关修改 2024-10-18 16:45:02 +08:00
zhaohengkun
f516365a5a Merge remote-tracking branch 'origin/main' 2024-10-18 10:43:59 +08:00
zhaohengkun
a5ac9ecaa5 收银台调整 2024-10-18 10:43:49 +08:00