Commit Graph

27 Commits

Author SHA1 Message Date
wangh
5aa43002fd 打印处理 2024-01-23 14:19:35 +08:00
wangh
662f21012d Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-19 18:32:13 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
@QQNZX
d406fb97a0 前端 2024-01-19 16:07:11 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
wangh
61d8947fd1 bug修改 2024-01-04 09:09:58 +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
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
7154546662 充值记录 2024-01-02 09:18:45 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
wangh
8148002ce2 no message 2023-12-22 18:18:21 +08:00
wangh
0b4359a2e5 小程序签到处理 2023-12-14 13:38:01 +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
e7f8a5bfc9 礼品卡兑换记录 2023-12-08 17:01:33 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
wangh
49529cd230 调整 2023-12-05 13:33:30 +08:00
wangh
f2aa5c9533 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-05 10:39:00 +08:00
wangh
8163e11ded no message 2023-12-05 10:38:56 +08:00
03a83c5702 油站活动 2023-12-05 09:43:37 +08:00
wangh
a913c83238 no message 2023-12-01 16:40:20 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
wangh
3cf58ca7b7 no message 2023-12-01 15:29:00 +08:00
wangh
e24a07c0fb 积分商城 2023-11-30 18:11:49 +08:00
577d636b5c uni项目提交 2023-11-27 09:24:16 +08:00