From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index de7ee56..19d3e7e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -10,15 +10,12 @@
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZProperty;
-import com.ruoyi.domain.ZYearInfo;
 import com.ruoyi.domain.ZYearInfo;
 import com.ruoyi.mapper.ZYearInfoMapper;
 import com.ruoyi.service.ZYearInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;

--
Gitblit v1.9.1