Merge remote-tracking branch 'origin/pim_yys' into pim_ywx

yaowanxin

2025-08-11 1b5604f8a88000e2f51d4c989fd179989468ee67

 src/main/java/com/ruoyi/account/service/AccountIncomeService.java

@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
import com.ruoyi.account.pojo.AccountIncome;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

public interface AccountIncomeService extends IService<AccountIncome> {

@@ -14,4 +16,6 @@
    IPage<AccountIncome> accountIncomeListPage(Page page, AccountIncome accountIncome);

    void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);

    List<AccountDto3> reportIncome();
}