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,7 @@
|
||||
package com.peanut.modules.book.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.book.entity.ChineseMedicineResearch;
|
||||
|
||||
public interface ChineseMedicineResearchService extends IService<ChineseMedicineResearch> {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.peanut.modules.book.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.book.entity.GeneralArticle;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public interface GeneralArticleService extends IService<GeneralArticle> {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.peanut.modules.book.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.book.dao.ChineseMedicineResearchDao;
|
||||
import com.peanut.modules.book.entity.ChineseMedicineResearch;
|
||||
import com.peanut.modules.book.service.ChineseMedicineResearchService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service("chineseMedicineResearchService")
|
||||
public class ChineseMedicineResearchServiceImpl extends ServiceImpl<ChineseMedicineResearchDao, ChineseMedicineResearch> implements ChineseMedicineResearchService {
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.peanut.modules.book.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.book.dao.GeneralArticleDao;
|
||||
import com.peanut.modules.book.entity.GeneralArticle;
|
||||
import com.peanut.modules.book.service.GeneralArticleService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class GeneralArticleServiceImpl extends ServiceImpl<GeneralArticleDao, GeneralArticle> implements GeneralArticleService {
|
||||
}
|
||||
Reference in New Issue
Block a user