lidongyang
ae117029fe
Merge branch 'main' of http://www.carsafe-caem.com/toolchaintechnologycenter/spdm-backend
# Conflicts:
# common/src/main/java/com/sdm/common/entity/req/project/SpdmReportReq.java
# project/src/main/java/com/sdm/project/controller/SimulationRunController.java
# project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
# project/src/main/java/com/sdm/project/service/ISimulationRunService.java
# project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
# project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
# project/src/main/resources/mapper/SimulationTaskMapper.xml