From 846ff7c7570ef124b10e48d6816955a1bbc02db5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 23 May 2024 01:33:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502

---
 src/main/java/com/nq/service/impl/SiteUserOptionLogServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/SiteUserOptionLogServiceImpl.java b/src/main/java/com/nq/service/impl/SiteUserOptionLogServiceImpl.java
index 240638a..c2643e9 100644
--- a/src/main/java/com/nq/service/impl/SiteUserOptionLogServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteUserOptionLogServiceImpl.java
@@ -40,7 +40,10 @@
     UserOptionLogMapper userOptionLogMapper;
 
     @Override
-    public ServerResponse<PageInfo> list(Integer userId, int pageNum, int pageSize) {
+    public ServerResponse<PageInfo> list( Integer agentId,Integer userId, int pageNum, int pageSize) {
+        if(null != agentId){
+
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<UserOptionLogVO> list = userOptionLogMapper.selective(userId);
         PageInfo pageInfo = new PageInfo(list);

--
Gitblit v1.9.3