Merge remote-tracking branch 'origin/master' into dev

王彪总
2 parents c57cf10d f864e599
Showing 1 changed file with 2 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java
@@ -61,8 +61,8 @@ public class DeviceUserServiceImpl implements DeviceUserService {
             deviceUser.setProductName(deviceInfo.getProductName());
             deviceUser.setCompanyId(createReqVO.getCompanyId());
             deviceUser.setDeptId(createReqVO.getDeptId());
-            deviceUser.setUserId(Long.parseLong(userId));
-            deviceUser.setUserName(userName);
+            deviceUser.setUserId(createReqVO.getUserId());
+            deviceUser.setUserName(createReqVO.getUserName());
             deviceUser.setCreateTime(now);
             deviceUser.setCreator(userId);
             deviceUser.setCreatorName(userName);