Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringDangerousBo.java

@@ -51,7 +51,7 @@ public class ZEngineeringDangerousBo extends BaseEntity {
     /**
      * 工程时间
      */
-    @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date enginTime;
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

@@ -248,9 +248,11 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o.getUrl());
+                pic.setFileName(o.getName());
+                pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setCreateTime(new Date());
                 pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
                 pic.setUpdateTime(new Date());
-                pic.setCreateTime(bo.getCreateTime());
                 list.add(pic);
             });
             if (!list.isEmpty()) {