Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

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

@@ -6,7 +6,9 @@
    <select id="getListByModelId" resultType="com.zt.life.modules.mainPart.taskReliability.model.Algorithm">
        select a.*
        from algorithm a
        where model_id=#{modelId}
        where
            a.is_delete = 0
            and model_id=#{modelId}
        order by step
    </select>