wangh
|
a3ed2f8b2d
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-01-08 10:07:57 +08:00 |
|
wangh
|
0f37e8db23
|
bug修改
|
2024-01-08 10:07:07 +08:00 |
|
|
|
6813f67d38
|
优化项
|
2024-01-06 18:04:36 +08:00 |
|
|
|
5979294f18
|
优化项
|
2024-01-06 15:47:07 +08:00 |
|
wangh
|
214ab014ec
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintAdmin/.env.development
# fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
|
2024-01-06 15:13:27 +08:00 |
|
wangh
|
6119bba60b
|
no message
|
2024-01-06 15:07:18 +08:00 |
|
|
|
683b41e456
|
优化项
|
2024-01-06 13:37:21 +08:00 |
|
|
|
0596e7f689
|
优化项
|
2024-01-06 10:02:09 +08:00 |
|
|
|
eae119f033
|
优化项
|
2024-01-05 18:27:59 +08:00 |
|
|
|
13a435eb17
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
|
2024-01-05 18:20:49 +08:00 |
|
|
|
d92c33373a
|
修改bug
|
2024-01-05 18:19:48 +08:00 |
|
wangh
|
ea900039d4
|
bug处理
|
2024-01-05 16:53:19 +08:00 |
|
@QQNZX
|
9acd5324d5
|
前端
|
2024-01-05 14:02:20 +08:00 |
|
|
|
cff6a8942b
|
优化项
|
2024-01-04 18:44:52 +08:00 |
|
|
|
d6df89b3aa
|
Merge remote-tracking branch 'origin/master'
|
2024-01-04 12:05:09 +08:00 |
|
|
|
5b1c86be9b
|
修改bug
|
2024-01-04 12:04:59 +08:00 |
|
@QQNZX
|
d22f21bf03
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/config.js
|
2024-01-04 09:11:09 +08:00 |
|
wangh
|
6bf929b433
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-01-04 09:10:15 +08:00 |
|
wangh
|
61d8947fd1
|
bug修改
|
2024-01-04 09:09:58 +08:00 |
|
@QQNZX
|
0ecf231fd5
|
Merge remote-tracking branch 'origin/master'
|
2024-01-04 09:06:45 +08:00 |
|
|
|
876c391ef8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
|
2024-01-03 18:46:31 +08:00 |
|
|
|
4fa7be30bd
|
修改bug
|
2024-01-03 18:45:35 +08:00 |
|
|
|
12f4741acf
|
优化项
|
2024-01-03 18:40:21 +08:00 |
|
@QQNZX
|
03b512ef75
|
前端 模板的更新
|
2024-01-03 14:24:24 +08:00 |
|
|
|
a9b86ff520
|
Merge remote-tracking branch 'origin/master'
|
2024-01-03 09:12:08 +08:00 |
|
|
|
5d2b98d6fa
|
修改bug
|
2024-01-03 09:11:56 +08:00 |
|
|
|
b5d55b69f1
|
优化项
|
2024-01-02 18:36:47 +08:00 |
|
|
|
76befae703
|
优化项
|
2024-01-02 17:13:25 +08:00 |
|
@QQNZX
|
f161d1368a
|
前端
|
2024-01-02 15:56:33 +08:00 |
|
wangh
|
eac375458b
|
bug修改
|
2024-01-02 14:24:47 +08:00 |
|
wangh
|
adfb53bac2
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintAdmin_zt/.env.development
# fuintBackend/configure/dev/application.properties
# fuintBackend/fuint-application/src/main/resources/application.properties
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2024-01-02 11:29:51 +08:00 |
|
wangh
|
9f3dadf902
|
no message
|
2024-01-02 11:22:29 +08:00 |
|
wangh
|
9e403cd413
|
bug修改+中泰
|
2024-01-02 11:21:12 +08:00 |
|
@QQNZX
|
9974798e58
|
前端
|
2024-01-02 10:04:57 +08:00 |
|
|
|
53a7cce4dc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-29 13:40:44 +08:00 |
|
|
|
239aa0aeab
|
静态图片
|
2023-12-27 16:08:50 +08:00 |
|
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44: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 |
|
@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 |
|
