From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001 From: 云 <2163098428@qq.com> Date: 星期三, 22 四月 2026 09:36:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro --- src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java index 23e2508..795b46d 100644 --- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java +++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.dto.ReportDateDto; -import com.ruoyi.account.mapper.AccountIncomeMapper; import com.ruoyi.account.pojo.AccountExpense; -import com.ruoyi.account.pojo.AccountIncome; import com.ruoyi.account.service.AccountExpenseService; -import com.ruoyi.account.service.AccountFileService; import com.ruoyi.account.service.AccountIncomeService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.dto.DateQueryDto; @@ -14,11 +11,11 @@ import com.ruoyi.framework.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.Resource; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; -- Gitblit v1.9.3