Merge branch 'master-ucc-feature' into dev

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SearchController.java

@@ -38,7 +38,7 @@ public class SearchController {
     private final BranchCompanyController branchCompanyController;
 
     @GetMapping
-    public ObjectRestResponse search(@RequestParam(value = "type", required = false) String type,
+    public ObjectRestResponse search(@RequestParam(value = "type", required = false,defaultValue = "") String type,
                                      @RequestParam(value = "keyword", required = false) String keyWord,
                                      @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
                                      @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit) {