Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 ea744c63bf10f14fe5a51addf37083c384093e21

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

@@ -28,4 +28,7 @@
    List<ModelNodes> getModelNodes(Long shipId);

    void deleteByOperatConditId(Long operatConditId);

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