[feat]解决合并冲突问题
This commit is contained in:
parent
72febf46dd
commit
be04c3785c
@ -26,11 +26,6 @@ public interface VlogService extends IService<Vlog> {
|
|||||||
*/
|
*/
|
||||||
public void createVlog(VlogBO vlogBO);
|
public void createVlog(VlogBO vlogBO);
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询首页/搜索的vlog列表
|
|
||||||
*/
|
|
||||||
public Page<IndexVlogVO> getIndexVlogList(IndexListBO bo, Page page);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据视频主键查询vlog
|
* 根据视频主键查询vlog
|
||||||
*/
|
*/
|
||||||
|
@ -144,11 +144,6 @@ public class VlogServiceImpl extends ServiceImpl<VlogMapper, Vlog> implements Vl
|
|||||||
vlogMapper.insert(vlog);
|
vlogMapper.insert(vlog);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Page<IndexVlogVO> getIndexVlogList(IndexListBO bo, Page page) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer getVlogBeLikedCounts(String vlogId) {
|
public Integer getVlogBeLikedCounts(String vlogId) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user