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
This commit is contained in:
wangjinlei
2024-03-15 14:27:22 +08:00
19 changed files with 545 additions and 64 deletions

View File

@@ -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> {
}

View File

@@ -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> {
}