Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

 src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java

@@ -2,11 +2,11 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.pojo.SafeAccident;
import com.ruoyi.safe.mapper.SafeAccidentMapper;
import com.ruoyi.safe.service.SafeAccidentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.safe.mapper.SafeAccidentMapper;
import com.ruoyi.safe.pojo.SafeAccident;
import com.ruoyi.safe.service.SafeAccidentService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

/**
@@ -18,10 +18,10 @@
 * @since 2026-01-28 02:40:31
 */
@Service
@RequiredArgsConstructor
public class SafeAccidentServiceImpl extends ServiceImpl<SafeAccidentMapper, SafeAccident> implements SafeAccidentService {

    @Autowired
    private SafeAccidentMapper safeAccidentMapper;
    private final SafeAccidentMapper safeAccidentMapper;

    @Override
    public IPage<SafeAccident> pageSafeAccident(Page page, SafeAccident safeAccident) {