Merge branch 'feature-v4.1.0-20220620' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1991,6 +1991,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         List<StyleBean> styleBeans = Lists.newArrayList();
         for (JSONObject style : styles) {
             Long createTime = style.getLong("createTime");
+            createTime = Objects.isNull(createTime) ? Calendar.getInstance().getTimeInMillis() : createTime;
             style.remove("createTime");
             styleBeans.add(
                 StyleBean.builder().style(style)