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

277 Commits

Author SHA1 Message Date
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
许允枞
4c3eb2ac79 更新 2024-09-13 17:47:41 +08:00
许允枞
042c3200c9 Merge remote-tracking branch 'origin/main' 2024-09-13 17:46:16 +08:00
13405411873
763db17eda 数据库设计 2024-09-13 16:44:45 +08:00
cun-nan
1440ad19e7 9.13 2024-09-13 16:30:17 +08:00
许允枞
c2bbf67a68 更新 2024-09-12 19:23:30 +08:00
xvv
b38f572218 Merge remote-tracking branch 'origin/main' 2024-09-12 18:18:18 +08:00
xvv
b01edd5d1a 9.8 2024-09-12 18:18:02 +08:00
cun-nan
9b8980556d 9.12 2024-09-12 17:54:56 +08:00
cun-nan
f13606857d 9.12 2024-09-12 15:44:25 +08:00
zhaotianfeng
490ac37b45 收银端-会员 交班 和 油站端同步 2024-09-12 14:15:24 +08:00
cun-nan
afe8f64d05 9.11 2024-09-11 18:03:14 +08:00
cun-nan
d182ba99ad 9.11 2024-09-11 17:35:10 +08:00
DESKTOP-369JRHT\12997
bea205f876 9.9 2024-09-10 14:58:47 +08:00
cun-nan
f46bb8a9b2 9.10 2024-09-10 10:22:50 +08:00
13405411873
7532c12f3d 营销活动。 2024-09-10 00:19:22 +08:00
PQZ
6436423875 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main 2024-09-09 23:24:22 +08:00
PQZ
c4e7d2059e 1 2024-09-09 23:24:18 +08:00
zhaotianfeng
8736c104b7 钊-礼品卡 2024-09-09 23:07:40 +08:00
zhaotianfeng
0e081c8969 钊-礼品卡 2024-09-09 22:59:21 +08:00
PQZ
6c60f63089 1 2024-09-09 22:29:15 +08:00
DESKTOP-369JRHT\12997
211e67a8f6 9.9 2024-09-09 18:42:05 +08:00
cun-nan
af22da2de6 9.9 2024-09-09 17:52:32 +08:00
DESKTOP-369JRHT\12997
5f054e7ac2 9.9 2024-09-09 17:49:44 +08:00
cun-nan
c92f9d546f 9.9 2024-09-09 16:50:54 +08:00
DESKTOP-369JRHT\12997
e53c5ba986 9.9 2024-09-09 16:42:38 +08:00
cun-nan
113c2734ca 9.9 2024-09-09 14:39:58 +08:00
DESKTOP-369JRHT\12997
fdf638a72f 9.9 2024-09-09 09:34:04 +08:00
DESKTOP-369JRHT\12997
39c30ad554 9.8 2024-09-09 09:33:08 +08:00
DESKTOP-369JRHT\12997
a86f52accb 9.8 2024-09-09 09:32:34 +08:00
cun-nan
cc71deba29 9.9 2024-09-09 08:46:27 +08:00
愉快的大福
1273e8c66f 11 2024-09-08 19:44:23 +08:00
愉快的大福
0a743eb2ed 储值卡规则 2024-09-08 18:26:21 +08:00
DESKTOP-369JRHT\12997
0484f41556 9.8 2024-09-08 18:09:40 +08:00
DESKTOP-369JRHT\12997
cdc81391c8 9.8 2024-09-08 17:38:26 +08:00
愉快的大福
4acf5c04bd 11 2024-09-08 16:49:07 +08:00
DESKTOP-369JRHT\12997
5cbaaba1dd 9.8 2024-09-08 16:43:55 +08:00
xvv
b6ad0d1113 9.8 2024-09-08 15:42:28 +08:00
xvv
08f7bafbbe 9.6 2024-09-06 16:15:25 +08:00
xvv
56356d7955 9.6 2024-09-06 14:21:45 +08:00
xvv
a7dec0a733 9.4 2024-09-06 13:38:58 +08:00
cun-nan
703f4e733b 营销 2024-09-05 16:37:42 +08:00
cun-nan
c9ab6b7f3f 营销 2024-09-05 14:37:36 +08:00
cun-nan
e5e0fa1fbd 营销 2024-09-05 09:54:29 +08:00
cun-nan
7991218e3e 营销 2024-09-05 09:46:48 +08:00
cun-nan
d6dbf9aec7 营销 2024-09-04 17:32:58 +08:00
xvv
b4e9ad4c37 9.4 2024-09-04 17:32:25 +08:00
xvv
6f65725ca1 9.4 2024-09-04 16:23:49 +08:00
cun-nan
224f30bb9f 营销 2024-09-04 13:50:50 +08:00
cun-nan
2a091ab1ca 营销 2024-09-04 13:42:53 +08:00
xvv
9358112b3b 9.4 2024-09-04 11:22:28 +08:00
cun-nan
d20bf1c47a 营销 2024-09-03 16:32:30 +08:00
cun-nan
8bd63ea9f3 营销 2024-09-03 11:07:47 +08:00