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

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

@@ -0,0 +1,37 @@
+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.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("main_ad")
+public class MainAdEntity  implements Serializable {
+
+    @TableId
+    private Integer id;
+
+    private Integer type;
+
+    private Integer appType;
+
+    private String icon;
+
+    private Integer relationId;
+
+    private Date createTime;
+
+    private Integer state;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private ShopProduct shopProduct;
+
+}