From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突

---
 service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java b/service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java
index a7e2d08..e228d31 100644
--- a/service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java
@@ -7,7 +7,7 @@
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.dto.RoomDto;
 import com.java110.dto.community.CommunityDto;
-import com.java110.dto.communityLocation.CommunityLocationDto;
+import com.java110.dto.community.CommunityLocationDto;
 import com.java110.dto.machine.MachineDto;
 import com.java110.dto.unit.FloorAndUnitDto;
 import com.java110.intf.common.IMachineInnerServiceSMO;

--
Gitblit v1.8.0