Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-18 a823bffa3800426d0a908b9397a8ea7586b5be21

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.UserPoint;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -18,5 +19,7 @@

    List<UserPoint> findLatestUserPointByTypeForUser(Long userId);

    IPage<UserPoint> queryUserPointPage(IPage<UserPoint> page, UserPoint userPoint);
    IPage<UserPoint> queryUserPointPage(@Param("page") IPage<UserPoint> page,@Param("userPoint") UserPoint userPoint);

    List<UserPoint> selectUserPoint(@Param("userPoint") UserPoint userPoint);
}