冲突合并

mhotel/src/com/happy/Model/BookingComment.java

@@ -56,7 +56,7 @@ public class BookingComment {
     private Double scoreWz;
 
     //    创建人
-    private String createId;
+    private Integer createId;
 
     //    评价人
     private String createName;

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

@@ -288,7 +288,7 @@ public class AppBookingCommentAction extends ActionSupport implements ServletReq
         BookingComment bookingComment = BookingComment.builder().bookingId(bookingId)
                 .hotelId(hotelId).houseId(houseId).content(content).commentStatus(commentStatus)
                 .score(score).scoreWs(scoreWs).scoreFw(scoreFw)
-                .scoreSs(scoreSs).scoreWz(scoreWz).createId(String.valueOf(createId))
+                .scoreSs(scoreSs).scoreWz(scoreWz).createId(createId)
                 .createUsername(createUsername).createDate(createDate)
                 .modifyDate(modifyDate).build();
 
@@ -377,7 +377,7 @@ public class AppBookingCommentAction extends ActionSupport implements ServletReq
         BookingComment bookingComment = BookingComment.builder().commentId(commentId).commentParentId(commentParentId).commentName(commentName).bookingId(bookingId)
                 .hotelId(hotelId).houseId(houseId).content(content).commentStatus(commentStatus)
                 .score(score).scoreWs(scoreWs).scoreFw(scoreFw)
-                .scoreSs(scoreSs).scoreWz(scoreWz).createId(String.valueOf(createId))
+                .scoreSs(scoreSs).scoreWz(scoreWz).createId(createId)
                 .createUsername(createUsername).createDate(createDate)
                 .modifyDate(modifyDate).build();