Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

2 天以前 03386a78c3a1f92efa21a6748e38c2c5d1c996d9

 src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java

@@ -21,4 +21,17 @@
    @TableField(exist = false)
    private String endDate;

    @ApiModelProperty("开始月份")
    @TableField(exist = false)
    private Integer startMonth;

    @ApiModelProperty("结束月份")
    @TableField(exist = false)
    private Integer endMonth;

    @ApiModelProperty("年份")
    @TableField(exist = false)
    private Integer year;


}