Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

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

@@ -62,4 +62,14 @@
        order by a.phase_id, a.operat_condit_id, a.product_id
    </select>

    <select id="getBinoParams" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskBinoParam">
        select a.*
        from
            task_bino_param a
        where
            a.IS_DELETE=0
        <if test="shipId!=null">
            and a.task_id = #{taskModelId}
        </if>
    </select>
</mapper>