Merge remote-tracking branch 'RuoYi/master' into master

4 years ago · fb0aeb3347
parent 29014d0891 25a4b8c285
commit fb0aeb3347
1 changed files with 1 additions and 0 deletions
--- a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm
@ -31,6 +31,7 @@ public class ${subClassName} extends BaseEntity
 #if($parentheseIndex != -1)
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
    @Excel(name = "${comment}")