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

331 Commits

Author SHA1 Message Date
ds
c684321039 11.1 2024-11-01 11:15:04 +08:00
cun-nan
af872a05c0 11.1 2024-11-01 11:05:55 +08:00
DESKTOP-369JRHT\12997
cf6755b3c8 11.1 2024-11-01 10:37:08 +08:00
DESKTOP-369JRHT\12997
2dc6af2040 11.1 2024-11-01 08:44:57 +08:00
齐天大圣
461965c760 Merge remote-tracking branch 'origin/main' 2024-11-01 08:22:24 +08:00
cun-nan
ca88835387 10.31 2024-10-31 17:53:24 +08:00
齐天大圣
f806e48df7 1 2024-10-31 17:13:15 +08:00
齐天大圣
2f894d00c5 1 2024-10-31 16:28:36 +08:00
齐天大圣
32d774dc27 1 2024-10-31 15:58:43 +08:00
cun-nan
6ea3834783 10.31 2024-10-31 15:54:59 +08:00
DESKTOP-369JRHT\12997
94c0c18e6f 10.31 2024-10-31 15:36:10 +08:00
cun-nan
1b09dab46f 10.31 2024-10-31 14:48:14 +08:00
zhaohengkun
807e73cf02 Merge remote-tracking branch 'origin/main' 2024-10-31 14:45:03 +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
齐天大圣
7c9d18eced 1 2024-10-31 11:19:37 +08:00
齐天大圣
9662e2951c 1 2024-10-31 11:17:58 +08:00
DESKTOP-369JRHT\12997
d1fb34d38a 10.31 2024-10-31 11:08:32 +08:00
DESKTOP-369JRHT\12997
43e138fce2 10.31 2024-10-31 10:46:02 +08:00
齐天大圣
2246eca9ee 1 2024-10-31 10:28:37 +08:00
齐天大圣
2c68d58198 1 2024-10-31 10:20:48 +08:00
DESKTOP-369JRHT\12997
e0604df6e5 10.31 2024-10-31 09:22:25 +08:00
齐天大圣
f9edc8af57 1 2024-10-31 09:22:23 +08:00
齐天大圣
fa8a8181b8 1 2024-10-31 08:53:01 +08:00
齐天大圣
1bae1749c7 收银台打印小票 2024-10-31 08:51:34 +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
cun-nan
207ecefc50 10.30 2024-10-30 15:52:14 +08:00
齐天大圣
4e3d502ae5 收银台打印小票 2024-10-30 14:28:13 +08:00
DESKTOP-369JRHT\12997
fa5ddf6a0b 10.30 2024-10-30 11:32:43 +08:00
cun-nan
1a61e3aef9 10.30 2024-10-30 11:16:16 +08:00
齐天大圣
a5fc7fbe9a Merge remote-tracking branch 'origin/main' 2024-10-30 10:30:27 +08:00
DESKTOP-369JRHT\12997
c7ddba466a 10.29 2024-10-29 18:05:39 +08:00
cun-nan
9bd50d00d5 10.29 2024-10-29 17:29:49 +08:00
DESKTOP-369JRHT\12997
e76741bb13 10.29 2024-10-29 17:21:46 +08:00
齐天大圣
daa07fbb4b 收银台打印小票 2024-10-29 16:48:20 +08:00
cun-nan
581cefa9b3 10.29 2024-10-29 15:40:39 +08:00
DESKTOP-369JRHT\12997
abdad63b26 10.29 2024-10-29 15:35:48 +08:00
DESKTOP-369JRHT\12997
004e2c8e98 10.29 2024-10-29 15:01:59 +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
DESKTOP-369JRHT\12997
d779143a62 10.29 2024-10-29 14:14:27 +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
6c77a34048 10.28 2024-10-28 13:51:30 +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
DESKTOP-369JRHT\12997
d9a0ff3125 10.26 2024-10-28 09:35:42 +08:00
齐天大圣
202399cfbf 收银台打印小票 2024-10-28 09:26:02 +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
DESKTOP-369JRHT\12997
bd5bba3198 10.25 2024-10-25 14:46:24 +08:00
cun-nan
130e8556ac 10.25 2024-10-25 13:46:53 +08:00
zhaohengkun
2aa71233f3 1 2024-10-25 11:48:41 +08:00
DESKTOP-369JRHT\12997
6163dec554 10.25 2024-10-25 09:07:52 +08:00
cun-nan
03673579f5 10.24 2024-10-24 18:01:22 +08:00
cun-nan
82bbcefc9c 10.24 2024-10-24 17:04:51 +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
DESKTOP-369JRHT\12997
a34eca0af1 10.24 2024-10-24 14:20:20 +08:00
cun-nan
d18fa885f8 10.24 2024-10-24 11:44:23 +08:00
cun-nan
2c0eee83cf 10.23 2024-10-23 17:56:17 +08:00
cun-nan
953c53696c 10.23 2024-10-23 17:12:34 +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
DESKTOP-369JRHT\12997
a625342084 10.23 2024-10-23 08:52:43 +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
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
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
d0a1a9ca4e 会员折扣 修改 2024-10-18 18:12:26 +08:00
zhaohengkun
19b9276c61 优惠券相关修改 2024-10-18 18:05:17 +08:00
cun-nan
6bd2ecd154 10.18 2024-10-18 17:34:16 +08:00
zhaohengkun
86b9c1997d 优惠券相关修改 2024-10-18 16:45:02 +08:00
cun-nan
cfe0171e60 10.18 2024-10-18 11:18:35 +08:00
DESKTOP-369JRHT\12997
c92e63dbc7 10.18 2024-10-18 11:14:43 +08:00
cun-nan
10f36850d7 10.18 2024-10-18 10:47:31 +08:00
cun-nan
1ae880d708 10.18 2024-10-18 10:46:56 +08:00
DESKTOP-369JRHT\12997
733e3d38c4 10.16 2024-10-18 10:29:49 +08:00
zhaohengkun
e8a4da0826 BUG + 收银台调整 2024-10-18 09:33:26 +08:00
cun-nan
a9727156f7 10.17 2024-10-17 17:46:51 +08:00
DESKTOP-369JRHT\12997
46be42fc5a 10.16 2024-10-17 14:35:24 +08:00
DESKTOP-369JRHT\12997
442f1aa0ac Merge remote-tracking branch 'origin/main' 2024-10-17 13:57:56 +08:00
DESKTOP-369JRHT\12997
fd65893af1 10.16 2024-10-17 13:57:45 +08:00
cun-nan
37c9eb40ce 10.17 2024-10-17 11:27:25 +08:00
DESKTOP-369JRHT\12997
3996c44056 10.16 2024-10-16 20:42:28 +08:00
DESKTOP-369JRHT\12997
29b603889b 10.16 2024-10-16 20:00:39 +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
许允枞
e677e8cc5d 更新10.16 2024-10-16 11:43:39 +08:00
许允枞
6f21acbccc 更新10.16 2024-10-16 11:21:02 +08:00
DESKTOP-369JRHT\12997
dc8d178882 Merge remote-tracking branch 'origin/main' 2024-10-16 09:39:11 +08:00