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

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

      * 根据房源查询最近的设置记录
      * @param houseId  房源ID
      */
-    @RequestMapping(value="/taHouseSetting/last",method= RequestMethod.GET)
+    @RequestMapping(value="/ma/taHouseSetting/last",method= RequestMethod.GET)
     @ApiOperation(value="根据房源查询最近的设置记录", notes = "根据房源查询最近的设置记录", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getTaHouseSettingLast(@ApiParam("房源ID") @RequestParam("houseId") String houseId) throws Exception{
         TaHouseSetting taHouseSetting = iTaHouseSettingService.getLastByHouse(houseId);