Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/src/com/happy/action/bookCommentAction.java

@@ -160,7 +160,7 @@ public class bookCommentAction extends BaseController implements ServletRequestA
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            bookingComment.setCommentName("商家");//商家回复
+            bookingComment.setCreateUsername("商家");//商家回复
             int m = bookingCommentService.insterCommpent(bookingComment);
             if (m > 0){
                 resultJson.put("message", "回复成功");