diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java index efcf7b9..c483797 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java @@ -4,8 +4,8 @@ package org.nl.wms.decision_manage.controller.sectStrategy; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService; -import org.nl.wms.decision_manage.service.dao.StSectStrategy; -import org.nl.wms.decision_manage.service.dto.SectStrategyQuery; +import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; +import org.nl.wms.decision_manage.service.sectStrategy.dto.SectStrategyQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java index c604ebc..2d7af55 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java @@ -11,8 +11,8 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.utils.MapOf; import org.nl.wms.decision_manage.service.strategyConfig.IStStrategyConfigService; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; -import org.nl.wms.decision_manage.service.dto.StrategyQuery; +import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig; +import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java index 87df405..79b9a63 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java @@ -1,7 +1,7 @@ package org.nl.wms.decision_manage.service.sectStrategy.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.decision_manage.service.dao.StSectStrategy; +import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; /** *

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml index 9ee2ad1..a33ebef 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java index eff62a8..dc66834 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java @@ -4,8 +4,7 @@ import lombok.Data; import org.nl.common.domain.query.BaseQuery; import org.nl.common.domain.query.QParam; import org.nl.common.enums.QueryTEnum; -import org.nl.wms.decision_manage.service.dao.StSectStrategy; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; +import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; /* * @author ZZQ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java index 43f6da7..bf4fb02 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java @@ -2,8 +2,8 @@ package org.nl.wms.decision_manage.service.sectStrategy.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService; -import org.nl.wms.decision_manage.service.dao.StSectStrategy; -import org.nl.wms.decision_manage.service.dao.mapper.StSectStrategyMapper; +import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; +import org.nl.wms.decision_manage.service.sectStrategy.dao.mapper.StSectStrategyMapper; import org.springframework.stereotype.Service; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java index 7df10ec..9c12b32 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java @@ -1,9 +1,9 @@ package org.nl.wms.decision_manage.service.strategyConfig; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.decision_manage.service.dto.StrategyQuery; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig; +import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery; /** *

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java index b6b4e1a..0013912 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java @@ -3,8 +3,9 @@ package org.nl.wms.decision_manage.service.strategyConfig.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; -import org.nl.wms.decision_manage.service.dto.StrategyQuery; +import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig; +import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery; + import java.util.List; import java.util.Map; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml index 8d2b13a..501c54e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml @@ -1,6 +1,6 @@ - +