Merge branch 'task-lyh-inctype2' into test

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -1079,7 +1079,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneVo.setId(scenePlus.getId());
             sceneVo.setNum(scenePlus.getNum());
             sceneVo.setPayStatus(scenePlus.getPayStatus());
-            sceneVo.setCreateTime(DateUserUtil.getDate(ext.getAlgorithmTime()).getTime());
+
+            String time = ext.getAlgorithmTime();
+            if(ext.getAlgorithmTime() == null){
+                time = ext.getCreateTime();
+            }
+            sceneVo.setCreateTime(DateUserUtil.getDate(time).getTime());
             sceneVo.setSpace(ext.getSpace());
             voList.add(sceneVo);
         }