Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/controller/TaHousePersonController.java

@@ -67,10 +67,12 @@ public class TaHousePersonController extends BaseController {
     @RequestMapping(value="/ma/taHousePerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taHousePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("房源ID") @RequestParam(value = "houseId", required = false) String houseId) throws Exception{
 
 		    IPage<TaHousePerson> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaHousePerson> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(houseId), "house_id", houseId);
             queryWrapper.eq("status", StatusConstant.NORMAL);
             queryWrapper.orderByDesc("create_date");