Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-05-31 b8e7bb1791ff41be5ee8150cc46af082d7444a65

 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java

@@ -41,6 +41,7 @@
    private String floorId;
    private String floorNum;
    private String unitId;
    private String[] unitIds;
    private String unitNum;
    private String roomId;
    private String roomNum;
@@ -122,6 +123,10 @@
    //赠送金额
    private String giftAmount;


    //账户抵扣金额
    private String withholdAmount;

    //收费率
    private String chargeRate;

@@ -143,6 +148,11 @@
    private String[] configIds;

    private String yearMonth;


    private String cashierId;
    private String cashierName;


    public String getReceivableAmount() {
        return receivableAmount;
@@ -751,4 +761,36 @@
    public void setPayableAmount(String payableAmount) {
        this.payableAmount = payableAmount;
    }

    public String[] getUnitIds() {
        return unitIds;
    }

    public void setUnitIds(String[] unitIds) {
        this.unitIds = unitIds;
    }

    public String getWithholdAmount() {
        return withholdAmount;
    }

    public void setWithholdAmount(String withholdAmount) {
        this.withholdAmount = withholdAmount;
    }

    public String getCashierId() {
        return cashierId;
    }

    public void setCashierId(String cashierId) {
        this.cashierId = cashierId;
    }

    public String getCashierName() {
        return cashierName;
    }

    public void setCashierName(String cashierName) {
        this.cashierName = cashierName;
    }
}