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

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

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

@@ -26,4 +26,6 @@
    List<EmergencySuppliesInfoDetailDO> countEmergencySupplies(Page<EmergencySuppliesInfoDetailDO> page,EmergencySuppliesCountQuery query);

    List<EmergencySuppliesInfo> listByNoConditions();

    List<EmergencySuppliesInfo> listCountByIds(List<Long> ids);
}