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

# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ChineseMedicineResearchDao.java
#	src/main/java/com/peanut/modules/common/dao/GeneralArticleDao.java
#	src/main/java/com/peanut/modules/common/entity/ChineseMedicineResearch.java
#	src/main/java/com/peanut/modules/common/entity/GeneralArticle.java

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

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

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

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

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

@@ -0,0 +1,67 @@
+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;
+
+@Data
+@TableName("chinese_medicine_research")
+public class ChineseMedicineResearch implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 标签（中医经典，中医基础，中医临床，针灸推拿，中药研究）
+     */
+    private String type;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 链接（公微链接）
+     */
+    private String url;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 照片
+     */
+    private String image;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 文件地址
+     */
+    private String file;
+
+    /**
+     * 期刊文章引用方式
+     */
+    private String articleCitation;
+
+    @TableLogic
+    private Integer delFlag;
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,57 @@
+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;
+
+@Data
+@TableName("general_article")
+public class GeneralArticle implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 外链
+     */
+    private String url;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 文章类型 1文章 2外链形式
+     */
+    private Integer contentType;
+
+    /**
+     * 类型 1学术思想 2学术平台
+     */
+    private Integer type;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    @TableLogic
+    private Integer delFlag;
+
+
+
+
+
+
+}