Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel

puzhibing

2024-02-22 76dd910d1c4ea422700b155c6d38d46ce4e20888

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java

@@ -289,7 +289,8 @@
            endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
        }
        Integer uid = ShiroKit.getUser().getId();
        return userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
        Map<String, Object> map = userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
        return map;
    }

    /**