Merge remote-tracking branch 'origin/dev_ic_data' into develop

# Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
4 years ago · 24e5b92d7d
1 changed files with 1 additions and 0 deletions
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@ -53,6 +53,7 @@ import com.epmet.dto.result.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
+import com.epmet.dto.result.demand.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;