Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 e4246536ec8218b0444667cbe457c0d3d6e67bd9

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java

@@ -30,4 +30,5 @@
    void deleteByOperatConditId(Long operatConditId);

    List<OperatConditModel> getGKModelTrees(Long productId);
    List<OperatConditModel> getGKModelAssembled(Long gkId);
}