Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -30,7 +30,8 @@
    private String roomSubType;
    private String roomRent;
    private String roomArea;

    private String startTime;
    private String endTime;

    public String getRoomId() {
        return roomId;
@@ -87,7 +88,6 @@
    public void setBuiltUpArea(String builtUpArea) {
        this.builtUpArea = builtUpArea;
    }


    public String getUserId() {
        return userId;
@@ -168,4 +168,20 @@
    public void setRoomArea(String roomArea) {
        this.roomArea = roomArea;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
}