Merge branch 'dev'

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/ServiceCategoryController.java

@@ -37,9 +37,15 @@ public class ServiceCategoryController {
     private ServiceCategoryService serviceCategoryService;
 
 
-    @ApiOperation(value = "查询服务子类(大类全部返回)")
+    @ApiOperation(value = "服务列表")
     @GetMapping("list")
-    public Result<List<ServiceSubclassVO>> list(@RequestParam(required = false) String keyWord) {
+    public Result<List<ServiceCategoryVO>> list() {
+        return serviceCategoryService.list(null);
+    }
+
+    @ApiOperation(value = "根据key查询子类")
+    @GetMapping("find")
+    public Result<List<ServiceSubclassVO>> find(@RequestParam(required = false) String keyWord) {
         return serviceCategoryService.selectByKeyWord(keyWord);
     }