From d9d3e4edf8515d250337598c7d5b155ca7afb9c9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 09:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 6dc643d..c35a746 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -111,7 +111,7 @@
* @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
@@ -121,7 +121,7 @@
List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
- PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis);
+ List<Goods> queryAppUserIntegral(MallRequest request);
ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request);
--
Gitblit v1.7.1