[feat]解决合并冲突问题
This commit is contained in:
parent
1aebe07488
commit
72febf46dd
@ -82,6 +82,9 @@ public class VlogServiceImpl extends ServiceImpl<VlogMapper, Vlog> implements Vl
|
|||||||
private final RedisCache cache;
|
private final RedisCache cache;
|
||||||
private final RedisCache redisCache;
|
private final RedisCache redisCache;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMemberService memberService;
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public void updateVlogStatus(String fileId, Integer status, String reason) {
|
public void updateVlogStatus(String fileId, Integer status, String reason) {
|
||||||
@ -141,6 +144,11 @@ 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