From 79c1c457302663154f23325116614cf33d8f575b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 16:28:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountSubjectServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
similarity index 97%
rename from src/main/java/com/ruoyi/account/service/impl/AccountSubjectServiceImpl.java
rename to src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
index 37bf64b..a6c4149 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountSubjectServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
@@ -1,15 +1,15 @@
-package com.ruoyi.account.service.impl;
+package com.ruoyi.account.service.impl.financial;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.bean.dto.AccountSubjectDto;
-import com.ruoyi.account.bean.dto.AccountSubjectImportDto;
-import com.ruoyi.account.bean.vo.AccountSubjectVo;
-import com.ruoyi.account.mapper.AccountSubjectMapper;
-import com.ruoyi.account.pojo.AccountSubject;
-import com.ruoyi.account.service.AccountSubjectService;
+import com.ruoyi.account.bean.dto.financial.AccountSubjectDto;
+import com.ruoyi.account.bean.dto.financial.AccountSubjectImportDto;
+import com.ruoyi.account.bean.vo.financial.AccountSubjectVo;
+import com.ruoyi.account.mapper.financial.AccountSubjectMapper;
+import com.ruoyi.account.pojo.financial.AccountSubject;
+import com.ruoyi.account.service.purchase.AccountSubjectService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;

--
Gitblit v1.9.3