Commit d5d5dc0f authored by wangpeng's avatar wangpeng

Merge branch 'develop'

parents 242c52b5 c2b0831a
......@@ -127,14 +127,14 @@ public class FundHandleExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地-县" )
private String fundTown;
/**
* 公积金起缴日期
*/
/**
* 公积金起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金起缴日期", errorInfo = "公积金起缴日期不能为空",needExport = true)
@ExcelAttribute(name = "公积金起缴日期", errorInfo = "公积金起缴日期不能为空",needExport = true)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金起缴日期" )
private LocalDateTime providentStart;
private String providentStart;
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment