Merge branch 'master' into wangfy-dev

wfy

2021-09-14 cd33651deff9fff7e7d9651b766210771c075190

 java110-bean/src/main/java/com/java110/po/owner/RepairPoolPo.java

@@ -30,7 +30,7 @@
    private String statusCd;
    private String repairMaterials;
    private String repairFee;

    private String payType;

    public String getRepairId() {
        return repairId;
@@ -144,7 +144,6 @@
        this.statusCd = statusCd;
    }


    public String getRepairChannel() {
        return repairChannel;
    }
@@ -176,4 +175,12 @@
    public void setRepairFee(String repairFee) {
        this.repairFee = repairFee;
    }

    public String getPayType() {
        return payType;
    }

    public void setPayType(String payType) {
        this.payType = payType;
    }
}