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

6 years ago · 98521534c9
1 changed files with 1 additions and 1 deletions
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/excel/TopicExcel.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/excel/TopicExcel.java
@ -36,7 +36,7 @@ public class TopicExcel {
    @Excel(name = "发言人")
    private String nickname;
-    @Excel(name = "时间")
+    @Excel(name = "时间", format = "yyyy-MM-dd HH:mm:ss")
    private Date createdTime;
    @Excel(name = "话题内容")