From 9ff0db3f0cca9eab06d04a9773d725a1acc831d8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 23 十二月 2025 12:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
index d0546e8..874b5ab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
@@ -6,7 +6,9 @@
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.query.AppUserListQuery;
import com.ruoyi.system.query.PromotionPageListQuery;
+import com.ruoyi.system.query.UserPromotionPageListQuery;
import com.ruoyi.system.vo.PromotionPageListVo;
+import com.ruoyi.system.vo.UserPromotionPageListVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -33,4 +35,9 @@
List<TAppUser> transferPageUserList(@Param("query") AppUserListQuery query, @Param("pageInfo") PageInfo<TAppUser> pageInfo);
+ List<UserPromotionPageListVo> userPromotionPageList(@Param("page") Page<UserPromotionPageListVo> page, @Param("query") UserPromotionPageListQuery query);
+
+ List<UserPromotionPageListVo> userPromotionPageListExport(@Param("query") UserPromotionPageListQuery query);
+
+
}
--
Gitblit v1.7.1