Commit Graph

204 Commits

Author SHA1 Message Date
239aa0aeab 静态图片 2023-12-27 16:08:50 +08:00
wangh
0c222c88a5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-22 15:34:06 +08:00
wangh
087ce92cbf 中台处理 2023-12-22 15:33:38 +08:00
52379f54d0 加油信息 2023-12-19 18:03:05 +08:00
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
wangh
b4cdb77bdf no message 2023-12-18 17:44:23 +08:00
wangh
026b7e6d0b 主页的数据统计 2023-12-18 17:42:52 +08:00
@QQNZX
bfd2ed0eeb 油站pc 2023-12-14 15:26:00 +08:00
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