Commit Graph

1760 Commits

Author SHA1 Message Date
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
11bcdbd3e8 小程序支付 2023-12-22 14:44:26 +08:00
a96f61ecc8 小程序支付 2023-12-21 18:43:22 +08:00
90dda4de11 充值记录 2023-12-21 18:11:46 +08:00
dbf7d7a72a 小程序端推荐有礼 2023-12-21 17:50:14 +08:00
536614d596 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gasStation-uni/pages/my/my.vue
2023-12-21 17:49:34 +08:00
cc69c78e3e 小程序端推荐有礼 2023-12-21 17:48:13 +08:00
8a3ee12f1d 小程序支付 2023-12-20 16:04:56 +08:00
b5696f8dec Merge remote-tracking branch 'origin/master' 2023-12-20 14:30:54 +08:00
89010cb79d 小程序端新人有礼活动 2023-12-20 14:30:37 +08:00
52379f54d0 加油信息 2023-12-19 18:03:05 +08:00
wangh
4641b04b65 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-19 16:54:53 +08:00
wangh
89bf856d96 no message 2023-12-19 16:54:46 +08:00
wangh
79a9d8e47e 数据统计 2023-12-19 16:54:02 +08:00
@QQNZX
a02adf35a6 油站小程序 两个弹窗 2023-12-19 09:31:53 +08:00
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
f76021b177 Merge remote-tracking branch 'origin/master' 2023-12-18 17:55:09 +08:00
65ba434d19 子卡管理 2023-12-18 17:54:43 +08:00
wangh
b4cdb77bdf no message 2023-12-18 17:44:23 +08:00
wangh
96f978ae11 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelRecordMapper.java
2023-12-18 17:43:57 +08:00
wangh
026b7e6d0b 主页的数据统计 2023-12-18 17:42:52 +08:00
18551be789 Merge remote-tracking branch 'origin/master' 2023-12-18 17:32:45 +08:00
0a4cde035f 子卡管理 2023-12-18 17:32:37 +08:00
@QQNZX
42dd71dcc4 油站小程序 2023-12-18 16:32:08 +08:00
@QQNZX
447bf6c744 油站小程序 2023-12-18 16:31:53 +08:00
@QQNZX
5891934b1b 油站小程序 2023-12-18 15:43:32 +08:00
@QQNZX
4d5b7529e4 油站小程序 2023-12-18 15:19:34 +08:00
f8a1fdea61 修改小程序端的活动展示方式 2023-12-18 15:10:29 +08:00
@QQNZX
1b9036ffb0 Merge remote-tracking branch 'origin/master' 2023-12-18 11:32:54 +08:00
@QQNZX
936812a15e 油站小程序 2023-12-18 11:32:45 +08:00
aed22bb5a0 核销记录 2023-12-18 11:15:19 +08:00
134ce14aa3 Merge remote-tracking branch 'origin/master' 2023-12-18 11:15:03 +08:00
711d4a4e90 核销记录 2023-12-18 11:14:51 +08:00
@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
69eb9cccb5 Merge remote-tracking branch 'origin/master' 2023-12-14 15:56:43 +08:00
e0be7fbed7 小程序囤油卡 2023-12-14 15:54:53 +08:00
wangh
6e233b3f6a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-14 15:53:11 +08:00
wangh
959f950df0 no message 2023-12-14 15:53:06 +08:00
@QQNZX
48633780cd Merge remote-tracking branch 'origin/master' 2023-12-14 15:26:09 +08:00
@QQNZX
bfd2ed0eeb 油站pc 2023-12-14 15:26:00 +08:00
2c4febc2b7 订单信息 2023-12-14 15:06:24 +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