Merge remote-tracking branch 'origin/master'

“mitao”

2025-12-23 9ff0db3f0cca9eab06d04a9773d725a1acc831d8

 ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java

@@ -8,8 +8,10 @@
import com.ruoyi.system.query.AppUserListQuery;
import com.ruoyi.system.query.ProfitPageListQuery;
import com.ruoyi.system.query.PromotionPageListQuery;
import com.ruoyi.system.query.UserPromotionPageListQuery;
import com.ruoyi.system.vo.ProfitPageListVo;
import com.ruoyi.system.vo.PromotionPageListVo;
import com.ruoyi.system.vo.UserPromotionPageListVo;

import javax.validation.Valid;
import java.util.List;
@@ -47,4 +49,8 @@
    PageInfo<TAppUser> transferPageUserList(AppUserListQuery query);


    List<UserPromotionPageListVo> userPromotionPageList(Page<UserPromotionPageListVo> page, @Valid UserPromotionPageListQuery query);

    List<UserPromotionPageListVo> userPromotionPageListExport(@Valid UserPromotionPageListQuery query);

}