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

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

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.TaihuWelfareEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaihuWelfareDao extends MPJBaseMapper<TaihuWelfareEntity> {
+}

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

@@ -1,4 +1,27 @@
 package com.peanut.modules.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("taihu_welfare")
 public class TaihuWelfareEntity {
+
+    @TableId
+    private Integer id;
+
+    private String title;
+
+    private Integer type;
+
+    private String url;
+
+    private String content;
+
+    private Integer sort;
+
+    @TableLogic
+    private Integer delFlag;
 }

src/main/java/com/peanut/modules/common/to/ParamTo.java

@@ -15,4 +15,6 @@ public class ParamTo {
 
     private String keywords;
 
+    private String type;
+
 }