Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageMapper.xml

@@ -37,9 +37,9 @@
         </where>
         GROUP BY p.id
         ) t
-        JOIN system_scene_package_sublist s on t.id = s.scene_and_package
+       left JOIN system_scene_package_sublist s on t.id = s.scene_and_package and  s.is_deleted='0'
         <where>
-            s.is_deleted='0' and t.is_deleted='0'
+           t.is_deleted='0'
             <if test="packageName != null and packageName != ''">
                 and t.package_name like CONCAT('%',#{packageName,jdbcType=VARCHAR},'%')
             </if>