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/service/impl/UserServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 5f31e34..1edc9f8 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -145,7 +145,7 @@
 	}
 
 	@Override
-	public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
+	public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
 //		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		if (deptId != null){
 			String arr =deptId.toString();

--
Gitblit v1.9.3