更新！

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceInfoService.java

@@ -6,6 +6,7 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
 import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.OnLineState;
+import com.github.microservice.utils.DesenUtil;
 import com.zhongshu.iot.client.model.iot.IotMainModel;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoAddParam;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
@@ -471,7 +472,7 @@ public class DeviceInfoService {
         if (ObjectUtils.isNotEmpty(deviceInfo)) {
             BeanUtils.copyProperties(deviceInfo, deviceInfoModel);
             // 分组信息
-            deviceInfoModel.setProjectInfo(projectInfoService.toModel(deviceInfo.getProjectInfo()));
+            deviceInfoModel.setProjectInfo(projectInfoService.toSimpleModel(deviceInfo.getProjectInfo()));
             // 产品信息
             deviceInfoModel.setIotTemplate(iotService.toSimpleModel(deviceInfo.getProductCode()));
         }
@@ -491,7 +492,7 @@ public class DeviceInfoService {
                 GateWayUserInfoModel gateWayUserInfoModel = resultContent.getContent();
                 if (ObjectUtils.isNotEmpty(gateWayUserInfoModel)) {
                     deviceInfoModel.setMqttUserName(gateWayUserInfoModel.getUserName());
-                    deviceInfoModel.setMqttPassword(gateWayUserInfoModel.getPassWord());
+                    deviceInfoModel.setMqttPassword(DesenUtil.passWordDesen(gateWayUserInfoModel.getPassWord()));
                 }
             }
         }