Merge remote-tracking branch 'origin/master'

7 months ago · d37ff94b7f
parent f6f6ce4b15 83d0f55cea
commit d37ff94b7f
1 changed files with 2 additions and 2 deletions
--- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
+++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
@ -59,8 +59,8 @@ public class ApiController {
    @ApiOperation(tags = {"60脱水机"}, value = "获取实时数据")
    @GetMapping("/home/queryParam")
-    public AjaxResult queryPram(String deviceName) {
+    public AjaxResult queryPram(String name) {
-        return success(iApiService.queryPram(deviceName));
+        return success(iApiService.queryPram(name));
    }
    @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 msg字段")