Merge branch 'bug-move-f' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

@@ -203,7 +203,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         LambdaQueryWrapper<Folder> wrapper = new LambdaQueryWrapper<>();
 
         List<Long> folderIdList = getByFolderIds(folderIds);
-        if(folderIdList.size()>0){
+        if(folderIdList.size() >0){
             wrapper.notIn(Folder::getId,folderIdList);
         }
 
@@ -255,8 +255,9 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
     @Override
     public List<Folder> findByUserIdAndType(Long userId, Integer type, String name,String folderIds) {
         LambdaQueryWrapper<Folder> wrapper = new LambdaQueryWrapper<>();
+
         List<Long> folderIdList = getByFolderIds(folderIds);
-        if(folderIdList.size()>0){
+        if(folderIdList.size() >0){
             wrapper.notIn(Folder::getId,folderIdList);
         }
         wrapper.eq(Folder::getUserId,userId);