From 1e8ccfec6ebcf7787def13165d9932b0cccefc49 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 六月 2025 14:34:45 +0800
Subject: [PATCH] 1.文件上传格式调整 2.表格调整
---
basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
index e713fe8..b97c3d1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
@@ -3,13 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CoalInfoDto;
-import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.CoalInfo;
-import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.CoalInfoService;
import com.ruoyi.common.core.domain.R;
-import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -22,20 +22,28 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/basic/coalInfo")
+@RequestMapping("/coalInfo")
public class CoalInfoController {
private CoalInfoService coalInfoService;
/**
- * 鏌ヨ
+ * 鐓ょ鏌ヨ
*/
@GetMapping("/list")
public R<IPage<CoalInfo>> list(Page page, CoalInfoDto coalInfoDto) {
- IPage<CoalInfo> list = coalInfoService.selectCoalInfoList(page,coalInfoDto);
+ IPage<CoalInfo> list = coalInfoService.selectCoalInfoList(page, coalInfoDto);
return R.ok(list);
}
+ /**
+ * 鐓ょ淇℃伅 list
+ */
+ @GetMapping("/coalInfoList")
+ public R<List<CoalInfo>> coalInfoList() {
+ return R.ok(coalInfoService.coalInfoList());
+ }
+
/**
* 鏂板淇敼
--
Gitblit v1.9.3