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

329 Commits

Author SHA1 Message Date
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
DESKTOP-369JRHT\12997
ea55404cb2 10.16 2024-10-16 09:39:01 +08:00
许允枞
2b4777998c 更新10.16 2024-10-16 09:27:42 +08:00
许允枞
1c552c34be 更新10.16 2024-10-16 09:19:27 +08:00
DESKTOP-369JRHT\12997
38e8e706c8 10.16 2024-10-16 09:08:38 +08:00
DESKTOP-369JRHT\12997
7ec59293f4 10.16 2024-10-16 08:52:01 +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
许允枞
2285d94d08 更新10.15 2024-10-15 15:34:24 +08:00
许允枞
f4aa1c2685 更新10.15 2024-10-15 15:29:59 +08:00
许允枞
705b4980c6 更新10.15 2024-10-15 15:27:01 +08:00
cun-nan
8433734694 10.15 2024-10-15 14:51:04 +08:00
许允枞
2670baba28 更新10.15 2024-10-15 14:29:18 +08:00
cun-nan
977648f815 10.15 2024-10-15 14:27:49 +08:00
许允枞
15d9031179 更新10.15 2024-10-15 14:15:34 +08:00
DESKTOP-369JRHT\12997
c312b62dc8 10.15 2024-10-15 14:00:52 +08:00
DESKTOP-369JRHT\12997
e5dd95b3e0 10.15 2024-10-15 13:57:43 +08:00
DESKTOP-369JRHT\12997
76d32ab70b 10.15 2024-10-15 13:36:22 +08:00
许允枞
8e24852c64 更新10.15 2024-10-15 11:43:45 +08:00
DESKTOP-369JRHT\12997
80aa9d4914 10.15 2024-10-15 11:42:28 +08:00
DESKTOP-369JRHT\12997
52599ddc05 10.15 2024-10-15 11:09:07 +08:00
许允枞
bb21cf0aec 更新10.15 2024-10-15 09:53:01 +08:00
许允枞
6d48219cd6 更新10.14 2024-10-14 18:48:24 +08:00
许允枞
c7609e2437 更新10.14 2024-10-14 18:28:46 +08:00
许允枞
e52f64ab0d 更新10.14 2024-10-14 18:12:29 +08:00
许允枞
fa13713f12 更新10.14 2024-10-14 17:42:37 +08:00
许允枞
45dca221d8 更新10.14 2024-10-14 17:20:49 +08:00
cun-nan
5ef3b1964d Merge remote-tracking branch 'origin/main' 2024-10-14 16:42:34 +08:00
cun-nan
1cbdc02c7c 10.14 2024-10-14 16:42:02 +08:00
DESKTOP-369JRHT\12997
8f3d1b6c17 10.14 2024-10-14 16:40:27 +08:00
zhaohengkun
1aee452526 1 2024-10-14 16:32:01 +08:00
DESKTOP-369JRHT\12997
f306c1e6ab 10.14 2024-10-14 15:54:26 +08:00
许允枞
ee7d0db4c6 更新10.14 2024-10-14 14:24:53 +08:00
许允枞
3cbed13ed9 更新10.12 2024-10-14 14:19:22 +08:00
DESKTOP-369JRHT\12997
43339ac7fb 10.11 2024-10-14 14:06:09 +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
217fdd006e 修改bug 2024-10-12 18:10:56 +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
DESKTOP-369JRHT\12997
b3e7f6b61e 10.11 2024-10-12 14:51:25 +08:00
DESKTOP-369JRHT\12997
e7af9f6b53 10.11 2024-10-11 14:52:33 +08:00
许允枞
a6e0a3022c 更新10.10 2024-10-10 15:45:09 +08:00
许允枞
6341a4b932 更新10.10 2024-10-10 14:14:27 +08:00
许允枞
ac3ee2b0df 更新10.10 2024-10-10 11:49:00 +08:00
许允枞
d85d7b327c 更新10.10 2024-10-10 11:20:21 +08:00
许允枞
7c4c5ed7cf 更新10.10 2024-10-10 11:01:47 +08:00
许允枞
68c554655f 更新10.8 2024-10-08 18:08:42 +08:00
许允枞
843dfa0878 更新10.8 2024-10-08 17:01:44 +08:00
DESKTOP-369JRHT\12997
23e9d78e8c 10.8 2024-10-08 13:57:18 +08:00
13405411873
2fc94aad3d 营销活动 2024-10-08 11:38:41 +08:00
PQZ
f8c76ba0de 1 2024-09-30 17:31:15 +08:00
DESKTOP-369JRHT\12997
712310817a 9.30 2024-09-30 10:30:55 +08:00
cun-nan
584f15ded9 9.29 2024-09-29 16:40:07 +08:00
DESKTOP-369JRHT\12997
467fb91019 9.27 2024-09-29 15:30:09 +08:00
许允枞
029cb2d6f4 更新9.29 2024-09-29 13:59:54 +08:00
许允枞
3d1db972d5 更新9.28 2024-09-28 08:49:49 +08:00
PQZ
6a95c2833a 1 2024-09-26 17:19:45 +08:00
PQZ
75815cf4b0 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-09-26 17:13:54 +08:00
PQZ
1c6df767a5 适用商品 2024-09-26 17:13:51 +08:00
13405411873
3f93dd7ade 营销活动 2024-09-26 15:19:59 +08:00
DESKTOP-369JRHT\12997
7107bee0ea 单独的一个页 2024-09-25 16:25:10 +08:00
cun-nan
cfb12b40e0 9.25 2024-09-25 16:17:44 +08:00
13405411873
563bb48cea 营销活动 2024-09-25 15:56:24 +08:00
zhaohengkun
c5068f7ea1 修改bug 2024-09-25 14:56:16 +08:00
zhaotianfeng
6833b81a2b 修改bug 2024-09-25 11:53:41 +08:00
cun-nan
e77c15db19 提交 2024-09-24 17:24:39 +08:00
Vinjor
f7f711e3f2 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 
# Conflicts:
#	fuintCashierWeb/src/api/newHome/newHome.js
 2024-09-22 17:32:26 +08:00
Vinjor
aa58951e10 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
 2024-09-22 16:37:43 +08:00
13405411873
05c1363139 处理数据 2024-09-22 16:37:06 +08:00
cun-nan
774f328ea6 9.21 2024-09-21 17:35:37 +08:00
13405411873
b68287a4dc 处理数据 2024-09-21 09:24:50 +08:00
Vinjor
76407ff2ca Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-21 09:14:18 +08:00
Vinjor
776ab61925 收银台 2024-09-21 09:14:15 +08:00
13405411873
6a3d7af6c1 处理 2024-09-19 14:33:28 +08:00
cun-nan
45c78f6413 9.19 2024-09-19 13:54:46 +08:00
cun-nan
5ec0803c60 9.19 2024-09-19 11:11:16 +08:00
cun-nan
cffc29c555 9.19 2024-09-19 10:41:11 +08:00
cun-nan
f447a99058 9.19 2024-09-19 08:50:24 +08:00
cun-nan
941f32aeac 9.18 2024-09-18 17:24:03 +08:00
cun-nan
fc589e7f83 9.18 2024-09-18 16:02:56 +08:00
cun-nan
c111107dac 9.18 2024-09-18 13:34:55 +08:00
cun-nan
fd148c3404 9.18 2024-09-18 11:35:58 +08:00
xvv
48faf98fe6 9.18 2024-09-18 10:29:23 +08:00
cun-nan
5e7b508161 Merge remote-tracking branch 'origin/main' 2024-09-18 09:48:05 +08:00
cun-nan
65758df585 9.18 2024-09-18 09:47:17 +08:00
xvv
1ee07bf869 9.18 2024-09-18 09:37:28 +08:00
xvv
37ebf7fdbb 9.17 2024-09-17 17:59:26 +08:00
xvv
66db7bf32b 9.17 2024-09-17 17:43:44 +08:00
13405411873
c2f8720cbb 数据库设计 2024-09-17 16:51:52 +08:00
cun-nan
d158529d79 9.17 2024-09-17 11:18:25 +08:00
cun-nan
50facae364 9.16 2024-09-16 16:30:12 +08:00
cun-nan
66ace526b8 9.15 2024-09-15 20:26:35 +08:00
cun-nan
edd677bae7 9.15 2024-09-15 18:31:33 +08:00
cun-nan
53c1254eca 9.14 2024-09-14 16:21:44 +08:00
许允枞
31891b1b73 更新交接班页面样式问题 2024-09-14 15:44:13 +08:00
许允枞
e194526002 更新 2024-09-14 14:54:41 +08:00
许允枞
4eff6b3f5f 更新 2024-09-14 14:50:15 +08:00
许允枞
ac4d6eb764 更新 2024-09-14 14:36:06 +08:00
许允枞
d0b3a9d1bd 更新 2024-09-14 13:28:28 +08:00
cun-nan
e55d2df123 9.14 2024-09-14 11:46:31 +08:00
许允枞
4025f9ae7f 更新 2024-09-14 10:34:07 +08:00
许允枞
7b32e910c4 更新 2024-09-14 09:26:23 +08:00