Merge remote-tracking branch 'origin/master' into wumedical/v1

# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopStoreDao.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopStore.java

src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.ShopProductBookLabel;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopProductBookLabelDao extends BaseMapper<ShopProductBookLabel> {
+}

src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.ShopProductBookMarket;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopProductBookMarketDao extends BaseMapper<ShopProductBookMarket> {
+}

src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.ShopProductToBookLabel;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopProductToBookLabelDao extends BaseMapper<ShopProductToBookLabel> {
+}

src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.ShopProductToBookMarket;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopProductToBookMarketDao extends BaseMapper<ShopProductToBookMarket> {
+}

src/main/java/com/peanut/modules/common/dao/ShopStoreDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.ShopStore;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopStoreDao extends BaseMapper<ShopStore> {
+}

src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java

@@ -0,0 +1,53 @@
+package com.peanut.modules.book.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 lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("shop_product_book_label")
+public class ShopProductBookLabel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 父id
+     */
+    private Integer pid;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 0否1是
+     */
+    private Integer isLast;
+
+    /**
+     * 权重
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private List<ShopProductBookLabel> children;
+
+
+
+}

src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java

@@ -0,0 +1,55 @@
+package com.peanut.modules.book.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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("shop_product_book_market")
+public class ShopProductBookMarket implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 父id
+     */
+    private Integer pid;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 0否1是
+     */
+    private Integer isLast;
+
+    /**
+     * 权重
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private List<ShopProductBookMarket> children;
+
+
+
+
+}

src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java

@@ -0,0 +1,41 @@
+package com.peanut.modules.book.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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("shop_product_to_book_label")
+public class ShopProductToBookLabel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+
+    private Integer productId;
+
+    private Integer bookLabelId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private ShopProduct product;
+    @TableField(exist = false)
+    private ShopProductBookLabel label;
+
+
+
+
+}

src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java

@@ -0,0 +1,40 @@
+package com.peanut.modules.book.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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("shop_product_to_book_market")
+public class ShopProductToBookMarket implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+
+    private Integer productId;
+
+    private Integer bookMarketId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private ShopProduct product;
+    @TableField(exist = false)
+    private ShopProductBookMarket market;
+
+
+
+
+}

src/main/java/com/peanut/modules/common/entity/ShopStore.java

@@ -0,0 +1,34 @@
+package com.peanut.modules.book.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("shop_store")
+public class ShopStore implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+    /**
+     * 店名
+     */
+    private String name;
+    /**
+     * 介绍图片
+     */
+    private String images;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+}