diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index db780bb..2c30762 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -2,10 +2,11 @@ package com.bonus.zlpt.equip.mapper; import java.util.List; -import com.bonus.zlpt.common.core.domain.equip.DevInfo; -import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto; -import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; + import com.bonus.zlpt.common.core.domain.system.SysFile; +import com.bonus.zlpt.equip.api.domain.DevInfo; +import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; +import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; /** * 设备信息Mapper接口 diff --git a/zlpt-modules/zlpt-home/pom.xml b/zlpt-modules/zlpt-home/pom.xml index 02b6f2b..1aa4e74 100644 --- a/zlpt-modules/zlpt-home/pom.xml +++ b/zlpt-modules/zlpt-home/pom.xml @@ -24,6 +24,11 @@ hutool-all 5.8.18 + + com.bonus.zlpt + zlpt-api-equip + 3.6.3 + diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java index 9598e79..608f26a 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java @@ -1,10 +1,10 @@ package com.bonus.zlpt.home.controller; -import com.bonus.zlpt.common.core.domain.equip.DevInfo; -import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; + import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.page.TableDataInfo; +import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.home.service.MaDevInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java index 95a608f..d19bc8d 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java @@ -1,6 +1,5 @@ package com.bonus.zlpt.home.mapper; -import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import java.util.List; diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java index 58d5721..2f2ff30 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java @@ -1,6 +1,5 @@ package com.bonus.zlpt.home.service; -import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import java.util.List; diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java index b0fd4e1..277d286 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java @@ -1,6 +1,5 @@ package com.bonus.zlpt.home.service.impl; -import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.home.mapper.MaDevInfoMapper; import com.bonus.zlpt.home.service.MaDevInfoService;