合并

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -60,8 +60,7 @@ public class CustomerController extends BaseController {
             @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "endDate",value = "endDate:结束")
     })
     @RequestMapping(value = "/customerList", method = RequestMethod.GET)
-    public ResponseBean buildingList(@RequestBody String parameter,
-                                     @RequestParam(value = "pageNum", required = false)Integer pageNum,
+    public ResponseBean buildingList(@RequestParam(value = "pageNum", required = false)Integer pageNum,
                                      @RequestParam(value = "pageSize", required = false)Integer pageSize,
                                      @RequestParam(value = "name", required = false)String name,
                                      @RequestParam(value = "phone", required = false)String phone,