Commit 787a197d authored by 高建强's avatar 高建强

Merge remote-tracking branch 'origin/developer' into developer

parents e1df9dc8 de4a43ab
......@@ -218,8 +218,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
}
// 3.消防队伍-监控大队
List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
//List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
//List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
/*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
if (fireBrigadeResourceDto.getPic() != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment