Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/convert/CmmsSpotcheckContentConvert.java

@@ -29,10 +29,13 @@ public interface CmmsSpotcheckContentConvert {
 
     CmmsSpotcheckContentQueryVO convertVo(CmmsSpotcheckContent cmmsSpotcheckContent, List<CmmsSpotcheckContentItemVO> spotcheckContentItemList);
 
+
+    /**新增设备点检时，点检内容转换——无需对createBy（点检内容的录入人）进行转换*/
     @Mapping(target = "cmmsSpotcheckTitemList",source = "titemList")
     @Mapping(target = "files",source = "files")
     @Mapping(target = "spotcheckcontid",source = "content.id")
     @Mapping(target = "spotcheckdate",source = "date")
+    @Mapping(target = "createBy",ignore = true)
     CmmsSpotcheckQueryVO convertSpotcheckQueryVO(CmmsSpotcheckContent content, List<CmmsSpotcheckTitem> titemList, List<SysUploadFile> files, Date date);