移装告知 详情API 设备信息调整到 业务信息实体中

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -136,9 +136,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 equipmentInfos.get(0).put(s, JSON.parseArray(equipmentInfos.get(0).get(s).toString()));
             }
         }
+        Map<String, Object> map = equipmentInfos.get(0);
+        BeanUtil.copyProperties(transferNotice, map);
         return new HashMap<String, Map<String, Object>>() {{
-            this.put("transferNoticeInfo", transferNotice);
-            this.put("equipmentInfo", equipmentInfos.get(0));
+            this.put("transferNoticeInfo", map);
         }};
     }