Commit Graph

116 Commits

Author SHA1 Message Date
8d249e7e5e bug 2024-01-19 13:44:13 +08:00
44f040f6ae bug 2024-01-15 14:41:36 +08:00
@QQNZX
89d2d71152 前端 2024-01-15 11:39:48 +08:00
075427613d 修改bug 2024-01-10 15:30:04 +08:00
wangh
3054607717 bug修改 2024-01-09 17:09:45 +08:00
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
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
e740b59800 修改bug 2024-01-05 15:12:40 +08:00
85dbca19b3 Merge remote-tracking branch 'origin/master' 2024-01-05 15:12:01 +08:00
2b6d0a3a73 修改bug 2024-01-05 15:11:53 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
wangh
dd15966c48 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-04 15:56:26 +08:00
wangh
302c39b3dc Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/pages/index/index.vue
2024-01-04 15:55:48 +08:00
c67c0333dc 修改bug 2024-01-04 15:52:17 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
a7606cdb3a 修改bug 2024-01-04 15:25:45 +08:00
8792a11183 修改bug 2024-01-04 15:01:20 +08:00
0cda9f462d 修改bug 2024-01-04 13:22:39 +08:00
0d7caa02e8 修改bug 2024-01-04 12:12:36 +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
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
4fa7be30bd 修改bug 2024-01-03 18:45:35 +08:00
a529c7e67e 修改bug 2024-01-03 15:43:34 +08:00
99767393bc 修改bug 2024-01-03 13:39:21 +08:00
a897807c16 修改bug 2024-01-03 10:54:36 +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
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
c86397d612 Merge remote-tracking branch 'origin/master' 2024-01-02 12:45:52 +08:00
3389960aa5 充值记录 2024-01-02 12:45:39 +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
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
7154546662 充值记录 2024-01-02 09:18:45 +08:00
53288a6e77 意见反馈 2023-12-26 18:44:50 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
92aac838c5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
2023-12-25 14:44:23 +08:00
42869c8cd7 充值记录 2023-12-25 14:41:17 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
wangh
8148002ce2 no message 2023-12-22 18:18:21 +08:00
cc69c78e3e 小程序端推荐有礼 2023-12-21 17:48:13 +08:00
@QQNZX
a02adf35a6 油站小程序 两个弹窗 2023-12-19 09:31:53 +08:00
65ba434d19 子卡管理 2023-12-18 17:54:43 +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
5891934b1b 油站小程序 2023-12-18 15:43:32 +08:00