@QQNZX
|
f4e97540f3
|
油站小程序
|
2023-12-18 11:10:15 +08:00 |
|
@QQNZX
|
63339f8016
|
油站小程序
|
2023-12-18 09:22:30 +08:00 |
|
|
|
ad65f4e8df
|
Merge remote-tracking branch 'origin/master'
|
2023-12-15 17:41:34 +08:00 |
|
|
|
79e2d77212
|
核销记录
|
2023-12-15 17:41:25 +08:00 |
|
@QQNZX
|
c30f6ff2cd
|
油站小程序
|
2023-12-15 15:11:42 +08:00 |
|
@QQNZX
|
8022856572
|
油站小程序
|
2023-12-15 14:34:59 +08:00 |
|
@QQNZX
|
c90136e79b
|
油站小程序
|
2023-12-15 14:00:09 +08:00 |
|
|
|
407af8365e
|
用户余额查询
|
2023-12-15 13:48:17 +08:00 |
|
@QQNZX
|
bfd2ed0eeb
|
油站pc
|
2023-12-14 15:26:00 +08:00 |
|
wangh
|
29b2f0f586
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2023-12-14 13:40:31 +08:00 |
|
wangh
|
0b4359a2e5
|
小程序签到处理
|
2023-12-14 13:38:01 +08:00 |
|
wangh
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
|
|
f6c574e4aa
|
小程序活动加载页
|
2023-12-13 18:19:52 +08:00 |
|
|
|
b429636651
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
|
2023-12-13 17:11:02 +08:00 |
|
|
|
e00b708435
|
小程序我的券
|
2023-12-13 17:09:31 +08:00 |
|
@QQNZX
|
96c2c9d7b9
|
油站小程序
|
2023-12-11 09:43:13 +08:00 |
|
wangh
|
1cf76004b4
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-11 09:21:36 +08:00 |
|
wangh
|
0fab8cd1d4
|
订单详情页
|
2023-12-11 09:21:21 +08:00 |
|
|
|
5e2969c04f
|
订单信息
|
2023-12-09 15:31:46 +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 |
|
@QQNZX
|
78c5c4c595
|
前端
|
2023-12-09 15:10:30 +08:00 |
|
@QQNZX
|
a3e8c82806
|
前端
|
2023-12-09 15:10:18 +08:00 |
|
@QQNZX
|
9397009e36
|
前端
|
2023-12-09 13:21:01 +08:00 |
|
|
|
273f13cae9
|
礼品卡兑换记录
|
2023-12-09 13:13:47 +08:00 |
|
|
|
230bee5a9c
|
礼品卡兑换记录
|
2023-12-09 09:34:35 +08:00 |
|
@QQNZX
|
3e703613b9
|
前端
|
2023-12-09 09:28:30 +08:00 |
|
@QQNZX
|
a692fcdeb1
|
Merge remote-tracking branch 'origin/master'
|
2023-12-09 09:17:39 +08:00 |
|
@QQNZX
|
742f0f15d9
|
前端
|
2023-12-09 09:16:50 +08:00 |
|
|
|
e7f8a5bfc9
|
礼品卡兑换记录
|
2023-12-08 17:01:33 +08:00 |
|
@QQNZX
|
97b28daba3
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 16:26:57 +08:00 |
|
@QQNZX
|
89c2340190
|
前端 路由跳转
|
2023-12-08 16:24:02 +08:00 |
|
@QQNZX
|
50aef3631f
|
提交
|
2023-12-08 16:22:35 +08:00 |
|
@QQNZX
|
7d06b718bf
|
1
|
2023-12-08 16:16:52 +08:00 |
|
|
|
4599d08df9
|
订单信息
|
2023-12-08 15:48:54 +08:00 |
|
@QQNZX
|
e5535b1968
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 15:40:12 +08:00 |
|
|
|
2b1888b719
|
获取员工列表
|
2023-12-08 15:34:38 +08:00 |
|
@QQNZX
|
5f62e8d72d
|
1
|
2023-12-08 15:24:30 +08:00 |
|
|
|
116141d547
|
礼品卡兑换记录
|
2023-12-08 15:15:03 +08:00 |
|
|
|
ce0c69be7a
|
bug 12.08
|
2023-12-08 13:33:52 +08:00 |
|
|
|
4c674b0109
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 13:13:31 +08:00 |
|
|
|
9d1eb21787
|
礼品卡兑换
|
2023-12-08 13:13:21 +08:00 |
|
|
|
6451143ec3
|
订单信息
|
2023-12-07 18:28:31 +08:00 |
|
wangh
|
b40a9d8efe
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-07 10:24:29 +08:00 |
|
wangh
|
f50982f0e6
|
充值订单
|
2023-12-07 10:22:52 +08:00 |
|
|
|
31c8f79bc9
|
订单信息
|
2023-12-06 18:36:10 +08:00 |
|
|
|
19fc2fdb2b
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 18:01:06 +08:00 |
|
|
|
fbbe572286
|
优化活动
|
2023-12-06 18:00:48 +08:00 |
|
|
|
e70e41434f
|
订单信息
|
2023-12-06 10:28:49 +08:00 |
|
@QQNZX
|
899623c5b0
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 09:41:27 +08:00 |
|
