Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java

@@ -89,6 +89,13 @@
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());

        if(userStatus) {
             throw new IllegalArgumentException("您的试用期已经结束，请付费继续使用");

        }
        List<ZIdea> list = zIdeaService.selectByCondition();
        log.info("导出记录为:{}",list);
        ExcelUtil<ZIdea> util = new ExcelUtil<>(ZIdea.class);