Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -1072,8 +1072,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         if(pageInfo.getList() != null){
             for(ManualProjectTaskVo task : pageInfo.getList()){
-                task.setRunStartTimeFmt(getRqStr(task.getRunStartTime(), 2));
-                task.setRunEndTimeFmt(getRqStr(task.getRunEndTime(), 2));
+                task.setRunStartTimeFmt(getRqStr(task.getRunStartTime(), 1));
+                task.setRunEndTimeFmt(getRqStr(task.getRunEndTime(), 1));
                 setUpSceneInfo(task);
 
             }

simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -361,7 +361,7 @@
         select sublist_id,sublist_name,scene_num,weight,parent_id,scene_natural_ids,scene_traffic_ids,scene_statue_ids,scene_generalization_ids
         from scene_package_sublist
         where parent_id = #{id,jdbcType=VARCHAR} and is_deleted = '0'
-        order by seq desc
+        order by seq
     </select>
 
     <!--获取指标信息-->