From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 17:03:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/platform/src/main/java/com/doumee/api/business/SitesController.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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..7d55909 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
@@ -69,7 +69,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("绔欑偣閫氳鐩戞帶_鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:sites:query")
public ApiResponse<PageData<Sites>> findPage (@RequestBody PageWrap<Sites> pageWrap) {
@@ -91,17 +91,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