Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -56,6 +56,7 @@
    private String link;
    private String roomType;
    private String roomSubType;
    private String roomSubTypeName;
    private String roomRent;
    private String roomArea;

@@ -68,11 +69,10 @@

    private List<FeeDto> fees;


    private Date createTime;

    private String statusCd = "0";

    private String statusCd = "0";

    public String getFeeCoefficient() {
        return feeCoefficient;
@@ -236,7 +236,6 @@
        this.floorNum = floorNum;
    }


    public String[] getRoomIds() {
        return roomIds;
    }
@@ -356,4 +355,14 @@
    public void setRoomArea(String roomArea) {
        this.roomArea = roomArea;
    }

    public String getRoomSubTypeName() {
        return roomSubTypeName;
    }

    public void setRoomSubTypeName(String roomSubTypeName) {
        this.roomSubTypeName = roomSubTypeName;
    }


}