Merge remote-tracking branch 'origin/master'

xyc

2024-10-23 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6

 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);
}