瀏覽代碼

merge 处理冲突

tianyunperfect 3 年之前
父節點
當前提交
5f7b1d0fd3
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

+ 1 - 5
book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

@@ -1,7 +1,6 @@
 package com.book.server.service.impl;
 
 
-import com.book.server.common.entity.PageResult;
 import com.book.server.common.util.JsonUtils;
 import com.book.server.dao.entity.Book;
 import com.book.server.dao.entity.BookCategory;
@@ -12,10 +11,7 @@ import com.book.server.dao.entity.example.BookExample;
 import com.book.server.dao.entity.example.ManageBlockExample;
 import com.book.server.dao.entity.example.ManageBlockResourceExample;
 import com.book.server.dao.mapper.*;
-import com.book.server.model.VO.BlockRes;
-import com.book.server.model.VO.BookRes;
-import com.book.server.model.VO.ManageBlockResourceRes;
-import com.book.server.model.VO.QueryVO;
+import com.book.server.model.VO.*;
 import com.book.server.service.BookService;
 import com.book.server.utils.HttpTool;
 import com.google.gson.JsonArray;