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/repository/EmergencyWorkApproveInfoRepository.java

@@ -24,5 +24,5 @@

    void deleteWorkApproveById(@Param("id") Long id);

    void selectWorkApproveByRelateTypeAndRelateId(@Param("type")Integer type, @Param("id")Long id);
    List<EmergencyWorkApproveInfoDetailDO> selectWorkApproveByRelateTypeAndRelateId(@Param("type")Integer type, @Param("id")Long id);
}