Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-11 606e7c14e9a73c20028896f4e681a3f2c42e20fc

 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;
    }

    /**