|
|
18eaab3435
|
Merge remote-tracking branch 'origin/master'
|
2024-01-05 09:20:23 +08:00 |
|
|
|
bf724adf18
|
修改bug
|
2024-01-05 09:20:12 +08:00 |
|
|
|
cf1c679d19
|
优化项
|
2024-01-05 09:17:23 +08:00 |
|
|
|
cff6a8942b
|
优化项
|
2024-01-04 18:44:52 +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 |
|
wangh
|
29dbbca735
|
bug修改
|
2024-01-04 15:52:02 +08:00 |
|
|
|
8792a11183
|
修改bug
|
2024-01-04 15:01:20 +08:00 |
|
|
|
2cb89c7776
|
修改bug
|
2024-01-04 14:00:45 +08:00 |
|
|
|
d1566ef1ce
|
修改bug
|
2024-01-04 13:32:09 +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 |
|
|
|
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 |
|
|
|
93e3d51e5b
|
修改bug
|
2024-01-03 16:02:45 +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 |
|
|
|
b5d55b69f1
|
优化项
|
2024-01-02 18:36:47 +08:00 |
|
|
|
76befae703
|
优化项
|
2024-01-02 17:13:25 +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
|
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 |
|
|
|
53062019b4
|
Merge remote-tracking branch 'origin/master'
|
2024-01-02 09:18:54 +08:00 |
|
|
|
7154546662
|
充值记录
|
2024-01-02 09:18:45 +08:00 |
|
|
|
2bc16929cf
|
优化项
|
2023-12-29 18:09:33 +08:00 |
|
|
|
b5341ed627
|
首页banner图
|
2023-12-29 16:50:44 +08:00 |
|
|
|
a5d998b02d
|
满减
|
2023-12-29 15:27:06 +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 |
|
|
|
78fb118550
|
充值记录
|
2023-12-29 13:38:00 +08:00 |
|
|
|
830e435b56
|
子卡信息
|
2023-12-28 17:31:50 +08:00 |
|
|
|
cd24222c2a
|
子卡信息
|
2023-12-28 13:14:35 +08:00 |
|
|
|
323add1517
|
会员信息
|
2023-12-27 18:44:56 +08:00 |
|
wangh
|
c9dbe51f22
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-27 09:11:48 +08:00 |
|
wangh
|
0f7c14444d
|
完善站长一键登录+修改中台出现的bug
|
2023-12-27 09:11:43 +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 |
|
|
|
6faf9677e1
|
充值记录
|
2023-12-25 15:21:10 +08:00 |
|
|
|
dfba5774b0
|
充值记录
|
2023-12-25 14:53:08 +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 |
|
