Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/dto/UploadSceneDTO.java

@@ -34,6 +34,8 @@ public class UploadSceneDTO {
 
     private Integer shootCount;
 
+    private String taskNo;
+
     public String getkNo() {
         return kNo;
     }

src/main/java/com/fdkankan/contro/service/impl/HaixinServiceImpl.java

@@ -70,6 +70,7 @@ public class HaixinServiceImpl implements IHaixinService {
         sceneOrigBd.setRyName(dto.getRyName());
         sceneOrigBd.setShootCount(dto.getShootCount());
         sceneOrigBd.setExpectedTime(this.getExpectedTime(dto.getShootCount()));
+        sceneOrigBd.setTaskNo(dto.getTaskNo());
         sceneOrigBdService.save(sceneOrigBd);
 
         //推送进度