Merge remote-tracking branch 'origin/master' into master

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java

@@ -30,8 +30,8 @@
    }

    @Override
    public EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(Long id) {
        return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationById(id);
    public EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationByExecuteId(Long id) {
        return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationByExecuteId(id);
    }

    @Override