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

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

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

@@ -45,9 +45,8 @@
    }

    @Override
    public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id) {
        emergencyWorkApproveInfoRepository.selectWorkApproveByRelateTypeAndRelateId(type,id);
        return null;
    public List<EmergencyWorkApproveInfoDetailDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id) {
        return emergencyWorkApproveInfoRepository.selectWorkApproveByRelateTypeAndRelateId(type,id);
    }