Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

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

@@ -1,4 +1,4 @@
-package com.peanut.modules.book.entity;
+package com.peanut.modules.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -28,6 +28,8 @@ public class ShopStore implements Serializable {
      */
     private Date createTime;
 
+    private Integer sort;
+
     @TableLogic
     private Integer delFlag;
 

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

@@ -0,0 +1,34 @@
+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 lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("shop_store_to_product")
+public class ShopStoreToProductEntity {
+
+    @TableId
+    private Integer id;
+
+    private Integer storeId;
+
+    private Integer productId;
+
+    private Integer sort;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private ShopStore shopStore;
+
+    @TableField(exist = false)
+    private ShopProduct shopProduct;
+}