Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044

 server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java

@@ -68,7 +68,7 @@
    private String planCode;

    @ApiModelProperty(value = "计划完成日期")
    @ExcelColumn(name="计划日期",index = 4,width =15)
    @ExcelColumn(name="计划完成日期",index = 4,width =15)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date planDate;
    @ApiModelProperty(value = "计划开始日期")