|
|
18f724d177
|
10.14
|
2024-10-14 14:56:04 +08:00 |
|
zhaohengkun
|
0edf36a6d3
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-14 14:50:56 +08:00 |
|
zhaohengkun
|
dea17c543e
|
1
|
2024-10-14 14:50:36 +08:00 |
|
许允枞
|
3cbed13ed9
|
更新10.12
|
2024-10-14 14:19:22 +08:00 |
|
|
|
254295a0c1
|
10.14
|
2024-10-14 14:11:37 +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
|
825f0f315b
|
1
|
2024-10-12 18:11:36 +08:00 |
|
许允枞
|
95d279653d
|
更新10.12
|
2024-10-12 18:09:59 +08:00 |
|
|
|
48f29f4873
|
10.12
|
2024-10-12 17:29:35 +08:00 |
|
许允枞
|
2e641eb0b3
|
更新10.12
|
2024-10-12 16:29:59 +08:00 |
|
许允枞
|
e38565cb38
|
更新10.12
|
2024-10-12 15:08:18 +08:00 |
|
DESKTOP-369JRHT\12997
|
fe5cf30c51
|
Merge remote-tracking branch 'origin/main'
|
2024-10-12 14:49:59 +08:00 |
|
DESKTOP-369JRHT\12997
|
bbce47dda1
|
10.11
|
2024-10-12 14:49:42 +08:00 |
|
许允枞
|
4f974132a9
|
更新10.12
|
2024-10-12 14:43:16 +08:00 |
|
许允枞
|
d61f30cb08
|
更新10.12
|
2024-10-12 13:08:23 +08:00 |
|
|
|
4ed8126d60
|
10.12
|
2024-10-12 11:53:41 +08:00 |
|
|
|
5ec65bef7b
|
10.12
|
2024-10-12 11:43:08 +08:00 |
|
zhaohengkun
|
f9c9647133
|
1
|
2024-10-12 11:01:24 +08:00 |
|
许允枞
|
0fd7f53d4f
|
更新10.12
|
2024-10-12 09:15:04 +08:00 |
|
|
|
b7327ab54a
|
10.12
|
2024-10-12 08:39:49 +08:00 |
|
许允枞
|
21af38fd8e
|
更新10.11 更新积分兑换核销码
|
2024-10-11 18:13:24 +08:00 |
|
zhaohengkun
|
9e6ca618aa
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-11 17:23:01 +08:00 |
|
zhaohengkun
|
61aa8f5175
|
1
|
2024-10-11 17:22:12 +08:00 |
|
许允枞
|
fbd4e14f1b
|
更新10.11
|
2024-10-11 16:13:42 +08:00 |
|
许允枞
|
622df03a6e
|
更新10.11
|
2024-10-11 15:13:26 +08:00 |
|
许允枞
|
6651516ee7
|
更新10.11
|
2024-10-11 14:11:06 +08:00 |
|
许允枞
|
9a0095d202
|
更新10.11
|
2024-10-11 14:00:03 +08:00 |
|
zhaohengkun
|
920f67828c
|
BUG
|
2024-10-11 11:30:30 +08:00 |
|
许允枞
|
70fa9bfe1e
|
更新10.11
|
2024-10-11 11:00:54 +08:00 |
|
许允枞
|
248ad2bb95
|
更新10.11
|
2024-10-11 09:30:11 +08:00 |
|
许允枞
|
6593f70848
|
更新10.10 推荐会员充值有礼
|
2024-10-10 19:08:29 +08:00 |
|
zhaohengkun
|
963153f603
|
修改
|
2024-10-10 18:41:55 +08:00 |
|
zhaohengkun
|
c1b5af6364
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-10 18:35:42 +08:00 |
|
zhaohengkun
|
246155e176
|
修改
|
2024-10-10 18:35:04 +08:00 |
|
zhaohengkun
|
d8b123cb97
|
消费有礼 补充返回值
|
2024-10-10 18:33:53 +08:00 |
|
|
|
d535c0b7a6
|
10.10
|
2024-10-10 17:56:46 +08:00 |
|
|
|
45068ab88f
|
10.10
|
2024-10-10 16:50:18 +08:00 |
|
许允枞
|
8edd6408c1
|
更新10.10
|
2024-10-10 16:36:42 +08:00 |
|
许允枞
|
7c4c5ed7cf
|
更新10.10
|
2024-10-10 11:01:47 +08:00 |
|
zhaohengkun
|
afddbbde85
|
消费有礼 补充返回值
|
2024-10-10 10:33:51 +08:00 |
|
zhaohengkun
|
9f9c1c2c05
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-10 10:30:16 +08:00 |
|
zhaohengkun
|
564865783a
|
消费有礼
|
2024-10-10 10:29:59 +08:00 |
|
许允枞
|
960db8c98a
|
更新10.10
|
2024-10-10 10:25:16 +08:00 |
|
许允枞
|
ed1a41de21
|
更新10.10
|
2024-10-10 09:49:48 +08:00 |
|
许允枞
|
85fce1ac22
|
更新10.10
|
2024-10-10 09:23:33 +08:00 |
|
许允枞
|
1fe42d51f6
|
更新10.9
|
2024-10-09 18:12:21 +08:00 |
|
许允枞
|
7cce0cb66f
|
更新10.9
|
2024-10-09 18:01:07 +08:00 |
|
|
|
89fe6b7fa8
|
营销活动
|
2024-10-09 17:32:17 +08:00 |
|
许允枞
|
a94a0518e9
|
更新10.9
|
2024-10-09 16:48:06 +08:00 |
|
许允枞
|
44fdcdf686
|
更新10.9
|
2024-10-09 16:45:58 +08:00 |
|
|
|
484af8e842
|
10.9
|
2024-10-09 15:38:12 +08:00 |
|
许允枞
|
4686e8b5f1
|
更新10.9
|
2024-10-09 13:51:42 +08:00 |
|
许允枞
|
127d1b7a8a
|
更新10.9
|
2024-10-09 09:50:26 +08:00 |
|
许允枞
|
3452957db9
|
更新10.8
|
2024-10-08 18:29:23 +08:00 |
|
zhaohengkun
|
41b52c140a
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-08 18:25:41 +08:00 |
|
zhaohengkun
|
7c0e63f067
|
bug
|
2024-10-08 18:25:21 +08:00 |
|
许允枞
|
68c554655f
|
更新10.8
|
2024-10-08 18:08:42 +08:00 |
|
许允枞
|
843dfa0878
|
更新10.8
|
2024-10-08 17:01:44 +08:00 |
|
|
|
6fdb9d2012
|
Merge remote-tracking branch 'origin/main'
|
2024-10-08 15:25:58 +08:00 |
|
|
|
30017f2d21
|
10.8
|
2024-10-08 15:25:51 +08:00 |
|
zhaohengkun
|
cbc9fc0ae2
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-10-08 15:15:28 +08:00 |
|
zhaohengkun
|
001bbd7faa
|
bug
|
2024-10-08 15:15:22 +08:00 |
|
许允枞
|
d7dddcc948
|
更新10.8
|
2024-10-08 15:06:55 +08:00 |
|
|
|
5a65086d4d
|
营销活动
|
2024-10-08 14:29:58 +08:00 |
|
|
|
deb3db0b95
|
营销活动
|
2024-10-08 14:11:20 +08:00 |
|
许允枞
|
95a0ce60f9
|
更新10.8
|
2024-10-08 14:09:45 +08:00 |
|
zhaohengkun
|
11a2fe0512
|
bug
|
2024-10-08 11:43:42 +08:00 |
|
|
|
2fc94aad3d
|
营销活动
|
2024-10-08 11:38:41 +08:00 |
|
许允枞
|
aadf0ddd5f
|
更新10.8
|
2024-10-08 11:17:08 +08:00 |
|
|
|
cd15a2cf0b
|
10.8
|
2024-10-08 11:13:18 +08:00 |
|
许允枞
|
1bc439ec54
|
更新10.8
|
2024-10-08 11:09:12 +08:00 |
|
|
|
c866a4237b
|
10.8
|
2024-10-08 10:59:23 +08:00 |
|
zhaohengkun
|
fe942e2224
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-30 18:16:20 +08:00 |
|
zhaohengkun
|
8be7b0f73d
|
推荐消费有礼 消费有礼 以及这块业务BUG 修改
|
2024-09-30 18:15:58 +08:00 |
|
PQZ
|
05a6fafbd1
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main
|
2024-09-30 17:31:18 +08:00 |
|
PQZ
|
f8c76ba0de
|
1
|
2024-09-30 17:31:15 +08:00 |
|
许允枞
|
8698bf01a1
|
更新9.30
|
2024-09-30 16:54:06 +08:00 |
|
许允枞
|
976ca57b71
|
更新9.30
|
2024-09-30 15:05:34 +08:00 |
|
许允枞
|
c802e9ea0a
|
更新9.30
|
2024-09-30 11:45:40 +08:00 |
|
DESKTOP-369JRHT\12997
|
712310817a
|
9.30
|
2024-09-30 10:30:55 +08:00 |
|
许允枞
|
654545c8a7
|
更新9.29
|
2024-09-29 18:02:39 +08:00 |
|
许允枞
|
1e770c2003
|
更新9.29
|
2024-09-29 15:16:57 +08:00 |
|
许允枞
|
ee46331d8d
|
更新9.29
|
2024-09-29 15:11:04 +08:00 |
|
许允枞
|
3817350e1d
|
更新9.29
|
2024-09-29 14:57:57 +08:00 |
|
许允枞
|
029cb2d6f4
|
更新9.29
|
2024-09-29 13:59:54 +08:00 |
|
|
|
8f34536411
|
9.29
|
2024-09-29 11:20:08 +08:00 |
|
许允枞
|
2176938b4e
|
更新9.28
|
2024-09-28 18:08:43 +08:00 |
|
许允枞
|
e2c8c18a3c
|
更新9.28
|
2024-09-28 13:50:54 +08:00 |
|
许允枞
|
8d702bc6e4
|
更新9.28
|
2024-09-28 11:30:25 +08:00 |
|
许允枞
|
b8bdbaab89
|
更新9.28
|
2024-09-28 10:31:40 +08:00 |
|
许允枞
|
bba101f127
|
更新9.28
|
2024-09-28 10:04:38 +08:00 |
|
许允枞
|
4b735e02ce
|
更新9.28
|
2024-09-28 09:33:14 +08:00 |
|
|
|
dc7e6e1cbd
|
9.27
|
2024-09-27 17:33:11 +08:00 |
|
许允枞
|
d0d804734b
|
更新9.27
|
2024-09-27 17:30:52 +08:00 |
|
许允枞
|
c5f27ed0f9
|
更新9.27
|
2024-09-27 15:12:47 +08:00 |
|
许允枞
|
e425475bde
|
更新9.27
|
2024-09-27 11:49:38 +08:00 |
|
zhaohengkun
|
f2a7cd7b1a
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-27 11:12:19 +08:00 |
|
zhaohengkun
|
2d279e136e
|
后端 BUG
|
2024-09-27 11:11:58 +08:00 |
|
许允枞
|
721d954017
|
更新9.27
|
2024-09-27 10:34:28 +08:00 |
|
|
|
1969b5c0db
|
9.27
|
2024-09-27 10:20:09 +08:00 |
|
Vinjor
|
d0e3751aac
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
# fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
|
2024-09-27 10:10:29 +08:00 |
|
Vinjor
|
21e34c8ebe
|
收银台
|
2024-09-27 10:05:48 +08:00 |
|
许允枞
|
3653651021
|
更新9.27
|
2024-09-27 09:56:07 +08:00 |
|
许允枞
|
aebd7f67d3
|
更新9.26
|
2024-09-26 18:09:51 +08:00 |
|
|
|
2ec927d3b0
|
9.26
|
2024-09-26 17:58:06 +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 |
|
许允枞
|
513f5ab42f
|
更新9.26
|
2024-09-26 16:47:47 +08:00 |
|
zhaohengkun
|
89e1f60ac7
|
后端 BUG
|
2024-09-26 16:37:15 +08:00 |
|
|
|
3f93dd7ade
|
营销活动
|
2024-09-26 15:19:59 +08:00 |
|
zhaohengkun
|
c274a7f9e1
|
后端 BUG
|
2024-09-26 14:52:54 +08:00 |
|
许允枞
|
eef9acc901
|
更新9.26
|
2024-09-26 13:54:33 +08:00 |
|
Vinjor
|
e71c53ef96
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-26 13:45:56 +08:00 |
|
Vinjor
|
0f2503f73a
|
收银台
|
2024-09-26 13:45:48 +08:00 |
|
许允枞
|
8a545140a4
|
更新9.26
|
2024-09-26 11:08:43 +08:00 |
|
许允枞
|
58cb379326
|
更新9.25
|
2024-09-25 18:05:55 +08:00 |
|
许允枞
|
23663fabc2
|
更新9.25
|
2024-09-25 17:49:43 +08:00 |
|
|
|
cfb12b40e0
|
9.25
|
2024-09-25 16:17:44 +08:00 |
|
Vinjor
|
67793a651b
|
收银台
|
2024-09-25 14:22:06 +08:00 |
|
zhaotianfeng
|
8cc44016d7
|
修改bug
|
2024-09-25 11:53:05 +08:00 |
|
许允枞
|
57c3422180
|
更新9.24
|
2024-09-24 18:27:48 +08:00 |
|
|
|
e77c15db19
|
提交
|
2024-09-24 17:24:39 +08:00 |
|
许允枞
|
c7670d1b27
|
更新9.24
|
2024-09-24 17:04:37 +08:00 |
|
|
|
d6b86ab8e4
|
9.24
|
2024-09-24 16:49:13 +08:00 |
|
|
|
de3013171f
|
Merge remote-tracking branch 'origin/main'
|
2024-09-24 16:30:56 +08:00 |
|
|
|
a68677f0b8
|
9.24
|
2024-09-24 16:30:49 +08:00 |
|
许允枞
|
cbf3b0e15a
|
更新9.24
|
2024-09-24 16:19:17 +08:00 |
|
许允枞
|
4e4621e815
|
更新9.24
|
2024-09-24 11:23:34 +08:00 |
|
许允枞
|
eb127ee084
|
更新9.24
|
2024-09-24 10:50:47 +08:00 |
|
许允枞
|
3cd4b240c7
|
更新9.23
|
2024-09-23 16:05:05 +08:00 |
|
许允枞
|
b9036b8725
|
更新9.23
|
2024-09-23 13:43:59 +08:00 |
|
Vinjor
|
c7be416570
|
收银台优惠活动查询
|
2024-09-22 20:24:44 +08:00 |
|
Vinjor
|
a352d84ed6
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-22 18:53:19 +08:00 |
|
Vinjor
|
8c5c07aa0e
|
收银台
|
2024-09-22 18:53:15 +08:00 |
|
|
|
0417b46d55
|
处理数据
|
2024-09-22 18:34:17 +08:00 |
|
Vinjor
|
6168a1d29c
|
收银台
|
2024-09-22 17:33:14 +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 |
|
|
|
05c1363139
|
处理数据
|
2024-09-22 16:37:06 +08:00 |
|
Vinjor
|
f71acc410c
|
收银行查询逻辑
|
2024-09-22 14:57:08 +08:00 |
|
|
|
297d52e5ea
|
9.22
|
2024-09-22 14:16:55 +08:00 |
|
许允枞
|
7ab5ae5121
|
更新9.21
|
2024-09-21 18:38:23 +08:00 |
|
许允枞
|
1f6b51ae20
|
更新9.21
|
2024-09-21 17:16:01 +08:00 |
|
许允枞
|
6d59ca8743
|
更新9.21
|
2024-09-21 16:20:21 +08:00 |
|
|
|
6535769db2
|
9.21
|
2024-09-21 15:55:14 +08:00 |
|
许允枞
|
672a04e102
|
更新9.21
|
2024-09-21 15:52:05 +08:00 |
|
许允枞
|
14f7e66ffc
|
更新9.21
|
2024-09-21 14:21:08 +08:00 |
|
|
|
b49079e40e
|
处理数据
|
2024-09-21 11:17:25 +08:00 |
|
|
|
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 |
|
许允枞
|
a4c1320597
|
更新9.20
|
2024-09-20 17:59:07 +08:00 |
|
|
|
f727da7ce3
|
9.20
|
2024-09-20 17:52:19 +08:00 |
|
许允枞
|
18fb854e20
|
更新9.20
|
2024-09-20 17:07:57 +08:00 |
|
许允枞
|
5c70875129
|
更新9.20
|
2024-09-20 13:49:37 +08:00 |
|
许允枞
|
ecbcfcdd9d
|
更新9.20
|
2024-09-20 10:49:13 +08:00 |
|
zhaotianfeng
|
19f87e9461
|
短信发送BUG
|
2024-09-20 10:08:51 +08:00 |
|
|
|
e28b9e48bb
|
9.20
|
2024-09-20 09:07:19 +08:00 |
|
许允枞
|
5f5ff96bb9
|
更新9.19
|
2024-09-19 19:50:33 +08:00 |
|
许允枞
|
ce15bf3895
|
更新9.19
|
2024-09-19 15:49:33 +08:00 |
|
|
|
d654a1cd10
|
9.19
|
2024-09-19 15:38:12 +08:00 |
|
zhaotianfeng
|
369060486a
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-18 17:20:17 +08:00 |
|
zhaotianfeng
|
7fdca324c7
|
操作日志分页参数问题
|
2024-09-18 17:19:35 +08:00 |
|
许允枞
|
fdfd89903a
|
更新9.18
|
2024-09-18 16:53:51 +08:00 |
|
zhaotianfeng
|
7ea6567863
|
中台-小程序配置页面-新增 修改接口 加验证机构是否存在
|
2024-09-18 16:48:09 +08:00 |
|
|
|
fc589e7f83
|
9.18
|
2024-09-18 16:02:56 +08:00 |
|
|
|
fd148c3404
|
9.18
|
2024-09-18 11:35:58 +08:00 |
|
zhaotianfeng
|
949bce54f1
|
商品查询 加条件
|
2024-09-18 10:50:04 +08:00 |
|
zhaotianfeng
|
1a44f67c76
|
商品查询 加条件 库存>0
|
2024-09-18 10:25:29 +08:00 |
|
许允枞
|
b1b134b4ae
|
更新9.18
|
2024-09-18 09:45:09 +08:00 |
|
zhaotianfeng
|
29780ec583
|
分页条数参数修改
|
2024-09-18 09:36:35 +08:00 |
|
|
|
c2f8720cbb
|
数据库设计
|
2024-09-17 16:51:52 +08:00 |
|
许允枞
|
a5b7f4b5bf
|
更新9.15
|
2024-09-15 23:51:27 +08:00 |
|
|
|
53c1254eca
|
9.14
|
2024-09-14 16:21:44 +08:00 |
|
zhaotianfeng
|
4dc4552443
|
收银台 商品controller
|
2024-09-14 10:44:03 +08:00 |
|
许允枞
|
4025f9ae7f
|
更新
|
2024-09-14 10:34:07 +08:00 |
|
zhaotianfeng
|
bff22a19d5
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-14 10:12:32 +08:00 |
|
zhaotianfeng
|
50d71f8e5a
|
收银台 后台接口 油品列表 商品列表
|
2024-09-14 10:12:04 +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 |
|
|
|
763db17eda
|
数据库设计
|
2024-09-13 16:44:45 +08:00 |
|
|
|
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 |
|
|
|
9b8980556d
|
9.12
|
2024-09-12 17:54:56 +08:00 |
|
|
|
f13606857d
|
9.12
|
2024-09-12 15:44:25 +08:00 |
|
zhaotianfeng
|
b435f944f9
|
收银台-会员列表接口加条件
|
2024-09-12 14:08:46 +08:00 |
|
zhaotianfeng
|
540d1b3f5c
|
收银台-订单相关
|
2024-09-12 09:32:14 +08:00 |
|
|
|
afe8f64d05
|
9.11
|
2024-09-11 18:03:14 +08:00 |
|
|
|
d182ba99ad
|
9.11
|
2024-09-11 17:35:10 +08:00 |
|
|
|
f46bb8a9b2
|
9.10
|
2024-09-10 10:22:50 +08:00 |
|
|
|
02c2a664a1
|
9.10
|
2024-09-10 08:40:49 +08:00 |
|
|
|
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
|
9d8bd25072
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
|
2024-09-09 22:56:18 +08:00 |
|
zhaotianfeng
|
259e4e8268
|
钊-礼品卡
|
2024-09-09 22:33:49 +08:00 |
|
PQZ
|
120dabb9df
|
Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main
|
2024-09-09 22:30:04 +08:00 |
|
|
|
c9f6484428
|
已领数量
|
2024-09-09 22:29:19 +08:00 |
|
