Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

 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);
    }