Merge branch 'dev' into 'master'

dev - master 19 See merge request !346

Merge branch 'dev' into 'master'
dev - master 19 See merge request !346
2e27565b · wdy · c6895ed5 · b1716e43 · 2e27565b
Commit 2e27565b authored May 28, 2024 by wdy
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

EnterpriseImportFileVO.java ...main/java/com/ruoyi/domain/vo/EnterpriseImportFileVO.java +1 -1

No files found.
--- a/quality-review/src/main/java/com/ruoyi/domain/vo/EnterpriseImportFileVO.java
+++ b/quality-review/src/main/java/com/ruoyi/domain/vo/EnterpriseImportFileVO.java
@@ -46,7 +46,7 @@ public class EnterpriseImportFileVO {
    /**
     * 发布日期
     */
-    @Excel(name = "发布日期",sort = 4,dateFormat="yyyy-MM-dd")
+    @Excel(name = "发布日期",sort = 4,dateFormat="yyyy-MM-dd",prompt="yyyy/mm/ss")
    @ApiModelProperty("发布日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date publishDate;