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:
@@ -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> {
|
||||
}
|
||||
@@ -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> {
|
||||
}
|
||||
Reference in New Issue
Block a user