同步 dev 分支

This commit is contained in:
疯狂的狮子li
2021-06-23 10:02:55 +08:00
parent 3e5b850e25
commit 03c459e5a3
170 changed files with 1797 additions and 2979 deletions

View File

@ -1,7 +1,6 @@
package ${packageName}.vo;
import com.ruoyi.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
#foreach ($import in $importList)
import ${import};
#end
@ -41,7 +40,6 @@ public class ${ClassName}Vo {
@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
@Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#else
@Excel(name = "${comment}")
#end