Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 5cea5dff7f0d73c1b172252936b393fb390ab669

 modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml

@@ -65,7 +65,7 @@
    </select>
    <select id="getTimeDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram">
        select *
        from time_diagram
        from time_diagram_temp
        where is_delete = 0
        <if test="projectId!=null and projectId!=''">
            and PROJECT_ID = #{projectId}