From ad047e06bdfa5ee222080cb357403dc34fbc0f50 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 May 2021 21:04:50 +0800
Subject: [PATCH] 1.desk,service,user 模块 pom依赖修改 2.新增 blade-onenetstudio 模块，集成onenetstudio 基于MQTT协议的sdk,实现设备的属性上报功能
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index cc9d7d5..bd1d254 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -137,7 +137,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
--
Gitblit v1.9.3