From 229fd2513b22f1f1f168129cff7e1ddcb9a65bed Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 21 Mar 2024 09:45:39 +0800 Subject: [PATCH] 1 --- .../modules/book/controller/BookLabelAndMarketController.java | 2 +- .../modules/book/service/ShopProductBookLabelService.java | 2 +- .../modules/book/service/ShopProductBookMarketService.java | 2 +- .../modules/book/service/ShopProductToBookLabelService.java | 2 +- .../modules/book/service/ShopProductToBookMarketService.java | 2 +- .../book/service/impl/ShopProductBookLabelServiceImpl.java | 4 ++-- .../book/service/impl/ShopProductBookMarketServiceImpl.java | 4 ++-- .../book/service/impl/ShopProductToBookLabelServiceImpl.java | 4 ++-- .../book/service/impl/ShopProductToBookMarketServiceImpl.java | 4 ++-- .../peanut/modules/common/dao/ShopProductBookLabelDao.java | 4 ++-- .../peanut/modules/common/dao/ShopProductBookMarketDao.java | 4 ++-- .../peanut/modules/common/dao/ShopProductToBookLabelDao.java | 4 ++-- .../peanut/modules/common/dao/ShopProductToBookMarketDao.java | 4 ++-- .../peanut/modules/common/entity/ShopProductBookLabel.java | 2 +- .../peanut/modules/common/entity/ShopProductBookMarket.java | 2 +- .../peanut/modules/common/entity/ShopProductToBookLabel.java | 3 ++- .../peanut/modules/common/entity/ShopProductToBookMarket.java | 2 +- 17 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index 1ce9fbac..3acc3886 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; -import com.peanut.modules.book.entity.*; +import com.peanut.modules.common.entity.*; import com.peanut.modules.book.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/peanut/modules/book/service/ShopProductBookLabelService.java b/src/main/java/com/peanut/modules/book/service/ShopProductBookLabelService.java index 1f117ffc..1aad7024 100644 --- a/src/main/java/com/peanut/modules/book/service/ShopProductBookLabelService.java +++ b/src/main/java/com/peanut/modules/book/service/ShopProductBookLabelService.java @@ -1,7 +1,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.ShopProductBookLabel; +import com.peanut.modules.common.entity.ShopProductBookLabel; import java.util.List; public interface ShopProductBookLabelService extends IService { diff --git a/src/main/java/com/peanut/modules/book/service/ShopProductBookMarketService.java b/src/main/java/com/peanut/modules/book/service/ShopProductBookMarketService.java index 5e45f258..450e4d6e 100644 --- a/src/main/java/com/peanut/modules/book/service/ShopProductBookMarketService.java +++ b/src/main/java/com/peanut/modules/book/service/ShopProductBookMarketService.java @@ -1,7 +1,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.ShopProductBookMarket; +import com.peanut.modules.common.entity.ShopProductBookMarket; import java.util.List; public interface ShopProductBookMarketService extends IService { diff --git a/src/main/java/com/peanut/modules/book/service/ShopProductToBookLabelService.java b/src/main/java/com/peanut/modules/book/service/ShopProductToBookLabelService.java index 74c0bdc0..8bf3cd70 100644 --- a/src/main/java/com/peanut/modules/book/service/ShopProductToBookLabelService.java +++ b/src/main/java/com/peanut/modules/book/service/ShopProductToBookLabelService.java @@ -1,7 +1,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.ShopProductToBookLabel; +import com.peanut.modules.common.entity.ShopProductToBookLabel; public interface ShopProductToBookLabelService extends IService { } diff --git a/src/main/java/com/peanut/modules/book/service/ShopProductToBookMarketService.java b/src/main/java/com/peanut/modules/book/service/ShopProductToBookMarketService.java index bd7a2a80..bbebeec2 100644 --- a/src/main/java/com/peanut/modules/book/service/ShopProductToBookMarketService.java +++ b/src/main/java/com/peanut/modules/book/service/ShopProductToBookMarketService.java @@ -1,7 +1,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.ShopProductToBookMarket; +import com.peanut.modules.common.entity.ShopProductToBookMarket; public interface ShopProductToBookMarketService extends IService { } diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookLabelServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookLabelServiceImpl.java index 2eb19375..b7bad29c 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookLabelServiceImpl.java @@ -2,8 +2,8 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.book.dao.ShopProductBookLabelDao; -import com.peanut.modules.book.entity.ShopProductBookLabel; +import com.peanut.modules.common.dao.ShopProductBookLabelDao; +import com.peanut.modules.common.entity.ShopProductBookLabel; import com.peanut.modules.book.service.ShopProductBookLabelService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookMarketServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookMarketServiceImpl.java index c38cfed3..908f421b 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookMarketServiceImpl.java @@ -3,8 +3,8 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; -import com.peanut.modules.book.dao.ShopProductBookMarketDao; -import com.peanut.modules.book.entity.ShopProductBookMarket; +import com.peanut.modules.common.dao.ShopProductBookMarketDao; +import com.peanut.modules.common.entity.ShopProductBookMarket; import com.peanut.modules.book.service.ShopProductBookMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookLabelServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookLabelServiceImpl.java index 8214e22c..29eb07c5 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookLabelServiceImpl.java @@ -1,8 +1,8 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.book.dao.ShopProductToBookLabelDao; -import com.peanut.modules.book.entity.ShopProductToBookLabel; +import com.peanut.modules.common.dao.ShopProductToBookLabelDao; +import com.peanut.modules.common.entity.ShopProductToBookLabel; import com.peanut.modules.book.service.ShopProductToBookLabelService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookMarketServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookMarketServiceImpl.java index d2a6c724..8481daf9 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToBookMarketServiceImpl.java @@ -1,8 +1,8 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.book.dao.ShopProductToBookMarketDao; -import com.peanut.modules.book.entity.ShopProductToBookMarket; +import com.peanut.modules.common.dao.ShopProductToBookMarketDao; +import com.peanut.modules.common.entity.ShopProductToBookMarket; import com.peanut.modules.book.service.ShopProductToBookMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java index e8bd12be..41dd61c0 100644 --- a/src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java @@ -1,7 +1,7 @@ -package com.peanut.modules.book.dao; +package com.peanut.modules.common.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.peanut.modules.book.entity.ShopProductBookLabel; +import com.peanut.modules.common.entity.ShopProductBookLabel; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java index 8a000242..6a8030c0 100644 --- a/src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java @@ -1,7 +1,7 @@ -package com.peanut.modules.book.dao; +package com.peanut.modules.common.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.peanut.modules.book.entity.ShopProductBookMarket; +import com.peanut.modules.common.entity.ShopProductBookMarket; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java index b06ec98f..b58b7ab5 100644 --- a/src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java @@ -1,7 +1,7 @@ -package com.peanut.modules.book.dao; +package com.peanut.modules.common.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.peanut.modules.book.entity.ShopProductToBookLabel; +import com.peanut.modules.common.entity.ShopProductToBookLabel; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java index 0e3c9ea0..d9f73744 100644 --- a/src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java @@ -1,7 +1,7 @@ -package com.peanut.modules.book.dao; +package com.peanut.modules.common.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.peanut.modules.book.entity.ShopProductToBookMarket; +import com.peanut.modules.common.entity.ShopProductToBookMarket; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java index e52829f1..9724df7c 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java @@ -1,4 +1,4 @@ -package com.peanut.modules.book.entity; +package com.peanut.modules.common.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java index 26918781..a747d7d1 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java @@ -1,4 +1,4 @@ -package com.peanut.modules.book.entity; +package com.peanut.modules.common.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java index 39d78ecc..2cee2ba1 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java @@ -1,9 +1,10 @@ -package com.peanut.modules.book.entity; +package com.peanut.modules.common.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.peanut.modules.common.entity.ShopProductBookLabel; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java index 22f007cf..41937587 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java @@ -1,4 +1,4 @@ -package com.peanut.modules.book.entity; +package com.peanut.modules.common.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId;