Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

2 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

 src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.bean.dto.AccountDto2;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;