Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotInfoSaveReqVO.java

@@ -46,4 +46,6 @@ public class IotInfoSaveReqVO {
     private List<Map<String, String>> fileList;
 
     private String type;
+
+    private String folderJson;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -294,8 +294,8 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         }
         if ("out".equals(updateReqVO.getMaintain().getType())){
             try {
-                IotMaintainDO iotMaintain = BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class);
-                oaFlow.createOutRepairFlow(iotMaintain);
+//                IotMaintainDO iotMaintain = BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class);
+                oaFlow.createOutRepairFlow(updateObj);
             } catch (Exception e) {
                 throw new ServiceException(122, e.getMessage());
             }