Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-16 357935fb2785dc79f4f47ffa7e1c503bc8cea376

 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