Merge branch 'feature-sg-20230615-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -279,7 +279,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
                 if(this.modelKind.equals(ModelKind.THREE_D_TILE.code())
                         && CollUtil.isNotEmpty(sdTilesSceneSourceList)
-                        && sdTilesSceneSourceList.contains(SceneSource.JG.code())){
+                        && sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
                     scenePlusExt.setModelKind(ModelKind.THREE_D_TILE.code());
                     scenePlusExtService.updateById(scenePlusExt);