Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 java110-bean/src/main/java/com/java110/dto/reportInfoSetting/ReportInfoSettingDto.java

@@ -16,6 +16,7 @@

    private String reportType;
private String name;
private String nameLike;
private String startTime;
private String remark;
private String endTime;
@@ -87,4 +88,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getNameLike() {
        return nameLike;
    }

    public void setNameLike(String nameLike) {
        this.nameLike = nameLike;
    }
}