分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java

@@ -7,7 +7,7 @@
import com.ruoyi.manage.service.ManageRecordTotalService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import io.swagger.annotations.Api;
import javax.annotation.Resource;
import java.util.Map;