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

songhuangfeng123

2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3

 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