Merge remote-tracking branch 'origin/master'

xyc

2024-09-13 dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc

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

@@ -51,7 +51,7 @@
                   and f.is_delete = 0
                   and g.product_id = f.id
                   and g.is_delete = 0
                   and g.reliab_distrib_type = 2
                   and g.reliab_distrib_type = 3
             ) a
                 left join task_bino_param b on
                b.task_id = ${taskId}