From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/business/SitesController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/SitesController.java b/server/platform/src/main/java/com/doumee/api/business/SitesController.java
index 2b586aa..169afd4 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SitesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SitesController.java
@@ -7,7 +7,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Sites;
-import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
import com.doumee.dao.business.web.request.SitesMonitorDTO;
import com.doumee.service.business.SitesService;
import io.swagger.annotations.Api;
@@ -69,7 +68,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("绔欑偣閫氳鐩戞帶_鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:sites:query")
public ApiResponse<PageData<Sites>> findPage (@RequestBody PageWrap<Sites> pageWrap) {
@@ -91,17 +90,12 @@
}
- @ApiOperation("绔欑偣鍌ㄨ溅鐩戞帶")
+ @ApiOperation("绔欑偣鍌ㄨ溅鐩戞帶-鍒嗛〉鏌ヨ")
@PostMapping("/findSitesMonitorDTOPage")
@RequiresPermissions("business:sites:query")
- public ApiResponse<PageData<SitesMonitorDTO>> findSitesMonitorDTOPage(@RequestBody PageWrap<SitesMonitorDTO> pageWrap){
+ public ApiResponse<PageData<Sites>> findSitesMonitorDTOPage(@RequestBody PageWrap<SitesMonitorDTO> pageWrap){
return ApiResponse.success(sitesService.findSitesMonitorDTOPage(pageWrap));
}
- @ApiOperation("瀹炴椂杞︿綅淇℃伅")
- @PostMapping("/findSitesMonitorDTOPage")
- @RequiresPermissions("business:sites:query")
- public ApiResponse<PageData<SitesMonitorBikeDTO>> getSitesMonitorBikeDTO(@RequestBody PageWrap<SitesMonitorDTO> pageWrap){
- return ApiResponse.success(sitesService.getSitesMonitorBikeDTO(pageWrap));
- }
+
}
--
Gitblit v1.9.3