wangh
|
f0f50652e3
|
pc端 增加个人统计 和数据统计
|
2023-12-14 13:39:27 +08:00 |
|
wangh
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
wangh
|
841b823692
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-09 15:27:17 +08:00 |
|
wangh
|
e09841a85a
|
信息统计
|
2023-12-09 15:23:37 +08:00 |
|
|
|
ce0c69be7a
|
bug 12.08
|
2023-12-08 13:33:52 +08:00 |
|
wangh
|
f50982f0e6
|
充值订单
|
2023-12-07 10:22:52 +08:00 |
|
@QQNZX
|
3e22074fa1
|
12.05前端
|
2023-12-05 11:41:42 +08:00 |
|
@QQNZX
|
1042b55806
|
12.05前端
|
2023-12-05 11:16:58 +08:00 |
|
wangh
|
869f189c4d
|
no message
|
2023-12-05 09:24:31 +08:00 |
|
|
|
cadeccf2f8
|
储值卡
|
2023-12-01 16:49:10 +08:00 |
|
|
|
c4839870bc
|
会员信息
|
2023-12-01 15:40:43 +08:00 |
|
|
|
d48a4cabe7
|
会员信息
|
2023-11-30 18:30:46 +08:00 |
|
|
|
41cabe23d1
|
Merge remote-tracking branch 'origin/master'
|
2023-11-30 11:57:53 +08:00 |
|
|
|
e42e7dbbe3
|
会员信息
|
2023-11-30 11:48:14 +08:00 |
|
|
|
eecf1a94bd
|
提交忽略文件
|
2023-11-30 10:56:05 +08:00 |
|
|
|
f920b643aa
|
会员信息
|
2023-11-29 18:33:09 +08:00 |
|
|
|
71b21efc27
|
会员信息
|
2023-11-29 17:18:28 +08:00 |
|
@QQNZX
|
56449e11de
|
Merge remote-tracking branch 'origin/master'
|
2023-11-29 16:53:14 +08:00 |
|
@QQNZX
|
c9f277771f
|
11.29前端
|
2023-11-29 16:52:59 +08:00 |
|
|
|
491c8bf426
|
会员信息
|
2023-11-29 16:26:19 +08:00 |
|
|
|
cec9d85b3a
|
收银台
|
2023-11-28 18:33:35 +08:00 |
|
|
|
f30a3556e3
|
收银台
|
2023-11-27 18:28:41 +08:00 |
|
wangh
|
b00edb2f12
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-25 18:08:58 +08:00 |
|
wangh
|
7ea34fc665
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-25 18:08:29 +08:00 |
|
|
|
3f76359c59
|
收银台
|
2023-11-25 18:08:20 +08:00 |
|
wangh
|
90a3adc44f
|
bug
修改
|
2023-11-25 18:08:15 +08:00 |
|
@QQNZX
|
ac1c6325de
|
11.25前端
|
2023-11-25 18:07:50 +08:00 |
|
@QQNZX
|
e7ebac6b34
|
Merge remote-tracking branch 'origin/master'
|
2023-11-25 15:31:18 +08:00 |
|
@QQNZX
|
2dee747f0c
|
11.22前端
|
2023-11-25 15:31:09 +08:00 |
|
|
|
71e423f5a5
|
收银台
|
2023-11-25 10:27:36 +08:00 |
|
@QQNZX
|
41198cef57
|
11.22前端
|
2023-11-25 09:30:24 +08:00 |
|
@QQNZX
|
1088d21953
|
Merge remote-tracking branch 'origin/master'
|
2023-11-25 09:04:31 +08:00 |
|
@QQNZX
|
d5b4b7d316
|
11.22前端
|
2023-11-25 09:04:19 +08:00 |
|
|
|
ec27a74ce8
|
收银台
|
2023-11-24 18:13:11 +08:00 |
|
wangh
|
f706797001
|
bug修改
|
2023-11-24 17:59:53 +08:00 |
|
|
|
87147fbcf3
|
Merge remote-tracking branch 'origin/master'
|
2023-11-24 17:24:20 +08:00 |
|
|
|
92d425f57c
|
手机验证码登录
|
2023-11-24 17:24:10 +08:00 |
|
wangh
|
7e8e0fac03
|
修改
|
2023-11-24 10:23:59 +08:00 |
|
wangh
|
d68f87b29b
|
bug修改
|
2023-11-23 18:33:25 +08:00 |
|
|
|
5963655f43
|
收银台
|
2023-11-23 16:28:06 +08:00 |
|
wangh
|
b2574cc2cb
|
会员等级和进油修改
|
2023-11-22 18:05:02 +08:00 |
|
@QQNZX
|
64ee2829d3
|
Merge remote-tracking branch 'origin/master'
|
2023-11-22 17:05:16 +08:00 |
|
@QQNZX
|
d2ae2e29c5
|
11.22前端
|
2023-11-22 17:05:07 +08:00 |
|
wangh
|
19f521c406
|
修改bug
|
2023-11-22 10:53:41 +08:00 |
|
@QQNZX
|
729c9ec320
|
Merge remote-tracking branch 'origin/master'
|
2023-11-22 09:06:41 +08:00 |
|
@QQNZX
|
9031fbbe18
|
11.22前端
|
2023-11-22 09:06:13 +08:00 |
|
wangh
|
b51938071a
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-21 18:12:04 +08:00 |
|
wangh
|
174bfee9d5
|
bug修改
|
2023-11-21 18:11:49 +08:00 |
|
@QQNZX
|
3cc308ba41
|
11.21前端
|
2023-11-21 18:05:11 +08:00 |
|
@QQNZX
|
5988a46511
|
11.21前端
|
2023-11-21 16:44:51 +08:00 |
|
@QQNZX
|
c068cdefa0
|
11.21前端
|
2023-11-21 15:57:47 +08:00 |
|
@QQNZX
|
2d2668b761
|
11.21前端
|
2023-11-21 13:40:12 +08:00 |
|
@QQNZX
|
9e267202b7
|
11.21前端
|
2023-11-21 09:50:47 +08:00 |
|
@QQNZX
|
17a7860505
|
11.21前端
|
2023-11-21 09:09:52 +08:00 |
|
@QQNZX
|
0524b13b3c
|
11.20前端
|
2023-11-20 17:52:14 +08:00 |
|
@QQNZX
|
53524364dc
|
11.20前端
|
2023-11-20 11:23:38 +08:00 |
|
@QQNZX
|
a62eb32734
|
11.20
|
2023-11-20 09:28:45 +08:00 |
|
@QQNZX
|
a80c862306
|
11.16
|
2023-11-17 15:45:07 +08:00 |
|
@QQNZX
|
e9db6fd020
|
11.16
|
2023-11-17 15:38:56 +08:00 |
|
@QQNZX
|
0935f6b5f4
|
11.16
|
2023-11-17 15:12:06 +08:00 |
|
|
|
d184f6cccd
|
会员等级
|
2023-11-17 14:55:45 +08:00 |
|
@QQNZX
|
0747a79c6f
|
11.16
|
2023-11-17 13:09:47 +08:00 |
|
|
|
6f1406f8c6
|
收银台
|
2023-11-16 19:00:57 +08:00 |
|
wangh
|
4ef7e1cdca
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintCashierWeb/.env.development
|
2023-11-16 18:42:37 +08:00 |
|
@QQNZX
|
859a05407f
|
Merge remote-tracking branch 'origin/master'
|
2023-11-16 18:39:16 +08:00 |
|
@QQNZX
|
bbc0a08162
|
11.16
|
2023-11-16 18:39:06 +08:00 |
|
|
|
0143eed720
|
Merge remote-tracking branch 'origin/master'
|
2023-11-16 18:31:37 +08:00 |
|
|
|
b9f4fad30f
|
卡券核销
|
2023-11-16 18:31:29 +08:00 |
|
@QQNZX
|
dde0c7d4ee
|
11.16
|
2023-11-16 17:50:02 +08:00 |
|
@QQNZX
|
f0342e4544
|
11.16
|
2023-11-16 10:55:35 +08:00 |
|
|
|
758442ff37
|
Merge remote-tracking branch 'origin/master'
|
2023-11-15 19:36:20 +08:00 |
|
|
|
8581ade77e
|
新人有礼
|
2023-11-15 19:36:12 +08:00 |
|
@QQNZX
|
b3e199acb6
|
11.15
|
2023-11-15 18:42:06 +08:00 |
|
|
|
1c320b17c1
|
折扣营销
|
2023-11-15 18:26:05 +08:00 |
|
@QQNZX
|
6a8849aea4
|
11.15
|
2023-11-15 14:33:51 +08:00 |
|
@QQNZX
|
793e5c9e39
|
11.15
|
2023-11-15 09:09:34 +08:00 |
|
wangh
|
9fb78cf532
|
积分
|
2023-11-14 18:53:58 +08:00 |
|
@QQNZX
|
7ab789ba2a
|
11.11
|
2023-11-14 16:08:33 +08:00 |
|
|
|
6400889d3c
|
营销活动
|
2023-11-14 11:27:58 +08:00 |
|
|
|
4f69e72145
|
Merge remote-tracking branch 'origin/master'
|
2023-11-13 19:01:25 +08:00 |
|
|
|
f72db0c784
|
收银台
|
2023-11-13 18:59:13 +08:00 |
|
wangh
|
f2a65be97f
|
存油
|
2023-11-13 18:58:31 +08:00 |
|
wangh
|
22aee4bb01
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-13 16:54:24 +08:00 |
|
wangh
|
b080f3e344
|
前端支付
|
2023-11-13 16:54:15 +08:00 |
|
|
|
c06e8b1c59
|
收银台
|
2023-11-13 16:51:57 +08:00 |
|
@QQNZX
|
4feda12365
|
11.11
|
2023-11-13 10:04:51 +08:00 |
|
|
|
79134699fd
|
收银台
|
2023-11-11 18:04:49 +08:00 |
|
wangh
|
5d67b7cbb3
|
充值
|
2023-11-11 18:02:25 +08:00 |
|
@QQNZX
|
492e53ca49
|
Merge remote-tracking branch 'origin/master'
|
2023-11-11 17:54:12 +08:00 |
|
@QQNZX
|
bd14aef39b
|
11.11
|
2023-11-11 17:54:03 +08:00 |
|
wangh
|
3227f9b44b
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-11 13:28:09 +08:00 |
|
@QQNZX
|
aab74f80c3
|
11.11
|
2023-11-11 10:57:49 +08:00 |
|
wangh
|
b1b4e1c94d
|
积分
|
2023-11-10 18:19:33 +08:00 |
|
|
|
42b625266d
|
收银台
|
2023-11-10 18:10:23 +08:00 |
|
|
|
62f5e61959
|
收银台
|
2023-11-10 14:59:23 +08:00 |
|
DESKTOP-369JRHT\12997
|
46e0745947
|
积分设置
|
2023-11-09 18:31:36 +08:00 |
|
|
|
04e5fc97be
|
修改优惠券在线下线默认值
|
2023-11-09 13:53:02 +08:00 |
|
DESKTOP-369JRHT\12997
|
9e2b9068a2
|
积分
|
2023-11-08 18:08:54 +08:00 |
|
|
|
3c1a0c7ca9
|
收银台
|
2023-11-08 18:07:17 +08:00 |
|
|
|
55d4e8631d
|
11.6
|
2023-11-08 17:01:44 +08:00 |
|
|
|
94f072b247
|
11.6
|
2023-11-08 16:38:22 +08:00 |
|
|
|
c1b7ef61b5
|
11.6
|
2023-11-08 14:58:40 +08:00 |
|
|
|
4d28a69c94
|
Merge remote-tracking branch 'origin/master'
|
2023-11-08 09:33:29 +08:00 |
|
|
|
94adf07fa8
|
优惠券
|
2023-11-08 09:33:11 +08:00 |
|
|
|
2c9cbb0bc6
|
11.6
|
2023-11-08 09:18:49 +08:00 |
|
DESKTOP-369JRHT\12997
|
96497a7be9
|
积分订单
|
2023-11-07 18:04:43 +08:00 |
|
|
|
673b6ad10a
|
11.6
|
2023-11-07 13:31:31 +08:00 |
|
|
|
8e3d5b15ac
|
Merge remote-tracking branch 'origin/master'
|
2023-11-07 09:31:57 +08:00 |
|
|
|
557aba50c7
|
兑换券
|
2023-11-07 09:31:13 +08:00 |
|
|
|
b9dceb5426
|
Merge remote-tracking branch 'origin/master'
|
2023-11-07 09:01:34 +08:00 |
|
|
|
6d2d22be32
|
11.6
|
2023-11-06 18:07:31 +08:00 |
|
DESKTOP-369JRHT\12997
|
092ce688cc
|
积分商品
|
2023-11-06 17:52:12 +08:00 |
|
|
|
c44c43d9bb
|
11.6
|
2023-11-06 11:53:56 +08:00 |
|
|
|
a0f9d68658
|
11.6
|
2023-11-06 10:31:30 +08:00 |
|
DESKTOP-369JRHT\12997
|
46d6afad1d
|
积分商城
|
2023-11-03 17:59:55 +08:00 |
|
|
|
5472e4253b
|
便利店
|
2023-11-03 15:59:38 +08:00 |
|
|
|
88151c5fc8
|
Merge remote-tracking branch 'origin/master'
|
2023-11-03 15:58:49 +08:00 |
|
|
|
15310c076c
|
油卡bug
|
2023-11-03 15:58:40 +08:00 |
|
|
|
0d2960b96c
|
三个跳转
|
2023-11-03 15:57:15 +08:00 |
|
|
|
4c6c8b57b8
|
油卡bug
|
2023-11-03 15:45:54 +08:00 |
|
|
|
86fb080188
|
10.17 16：57
|
2023-11-03 11:07:29 +08:00 |
|
|
|
5f7bfc1652
|
10.17 16：57
|
2023-11-03 08:52:27 +08:00 |
|
|
|
590bad37d3
|
便利店
|
2023-11-02 18:38:22 +08:00 |
|
DESKTOP-369JRHT\12997
|
089dcbabbe
|
积分商城
|
2023-11-02 18:32:07 +08:00 |
|
|
|
906b804b2b
|
便利店
|
2023-10-31 18:18:30 +08:00 |
|
|
|
486da7ca40
|
10.17 16：57
|
2023-10-31 18:16:38 +08:00 |
|
DESKTOP-369JRHT\12997
|
3b64ce321f
|
更新货品审核的字典
|
2023-10-31 18:08:17 +08:00 |
|
DESKTOP-369JRHT\12997
|
9ea5b605ad
|
商品进货退货盘点货损
|
2023-10-31 17:55:49 +08:00 |
|
DESKTOP-369JRHT\12997
|
70b1a6d39a
|
1
|
2023-10-31 08:54:40 +08:00 |
|
DESKTOP-369JRHT\12997
|
189d0533ee
|
商品货损
|
2023-10-30 18:09:11 +08:00 |
|
|
|
5e06f4582f
|
便利店
|
2023-10-30 18:01:53 +08:00 |
|
DESKTOP-369JRHT\12997
|
bf244b1f50
|
商品
|
2023-10-28 17:12:18 +08:00 |
|
|
|
92eafa75ec
|
便利店
|
2023-10-28 15:03:28 +08:00 |
|
|
|
217a549247
|
便利店
|
2023-10-28 13:33:42 +08:00 |
|
DESKTOP-369JRHT\12997
|
70553d8615
|
退货
|
2023-10-28 09:04:27 +08:00 |
|
DESKTOP-369JRHT\12997
|
2a586c09ba
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-10-27 18:07:02 +08:00 |
|
DESKTOP-369JRHT\12997
|
179438917a
|
进货 退货
|
2023-10-27 18:06:09 +08:00 |
|
|
|
afa7d57bef
|
便利店
|
2023-10-27 18:04:07 +08:00 |
|
|
|
a7a60eb124
|
便利店
|
2023-10-27 16:29:53 +08:00 |
|
|
|
57f5d5489c
|
便利店
|
2023-10-27 10:49:09 +08:00 |
|
DESKTOP-369JRHT\12997
|
98a517e02b
|
便利店
|
2023-10-26 18:01:14 +08:00 |
|
|
|
f697d2bba8
|
便利店
|
2023-10-26 18:00:10 +08:00 |
|
|
|
2b6850b251
|
便利店
|
2023-10-26 16:02:04 +08:00 |
|
DESKTOP-369JRHT\12997
|
2af2037ed1
|
no message
|
2023-10-26 15:01:02 +08:00 |
|
|
|
9ca2e2e609
|
便利店
|
2023-10-26 14:53:44 +08:00 |
|
DESKTOP-369JRHT\12997
|
2eae3a90aa
|
油站结尾 - 进货开头
|
2023-10-26 13:52:13 +08:00 |
|
DESKTOP-369JRHT\12997
|
90b60aaadc
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintAdmin/.env.development
|
2023-10-26 11:44:24 +08:00 |
|
DESKTOP-369JRHT\12997
|
ff3f7ff1b7
|
1
|
2023-10-26 11:43:30 +08:00 |
|
|
|
19abf7e302
|
便利店
|
2023-10-26 11:04:48 +08:00 |
|
|
|
5040d2d9e1
|
收银台
|
2023-10-26 09:32:37 +08:00 |
|
