Merge remote-tracking branch 'refs/remotes/origin/master' into zf1

zhangf

2024-06-24 9289aa181144778637d18a3f727663a10b5195cc

 exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/EmonTrainRecordService.java

@@ -13,7 +13,7 @@

    EmonTrainRecord findValidById(Long id);

    List<EmonTrainRecord> listValid();
    List<EmonTrainRecord> listValid(List<Long> childrenIds);

}