修改bug

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontController.java

@@ -83,9 +83,9 @@ public class GoblinFrontController {
     public ResponseDto<GoblinFrontCubeVo> getCube() throws ParseException {
         return ResponseDto.success( goblinFrontService.getCube());
     }
-    @GetMapping("getCategory")
-    @ApiOperation("获取分类")
-    public ResponseDto getCategory(@RequestParam(name = "type", required = true) String type,@RequestParam(name = "categoryId", required = true)String categoryId,@RequestParam(name = "page", required = true)int page,@RequestParam(name = "pageSize", required = true)int pageSize) throws ParseException {
+    @GetMapping("getCategoryList")
+    @ApiOperation("获取分类列表商品")
+    public ResponseDto<GoblinFrontCategoryListVo> getCategoryList(@RequestParam(name = "type", required = true) String type,@RequestParam(name = "categoryId", required = true)String categoryId,@RequestParam(name = "page", required = true)int page,@RequestParam(name = "pageSize", required = true)int pageSize) throws ParseException {
         return ResponseDto.success( goblinFrontService.getCategoryList(type,categoryId,page,pageSize));
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -280,7 +280,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public GoblinFrontCategoryListVo getCategoryList(String type,String categoryId,int page,int pageSize){
         //
         Query query = new Query();
-        query.addCriteria(new Criteria().andOperator(
+        query.addCriteria(new Criteria().orOperator(
                 Criteria.where("cateSid").is(categoryId),
                 Criteria.where("cateTid").is(categoryId)
         ));