From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001 From: ws <ws@123.com> Date: 星期三, 20 九月 2023 17:45:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java index 80def0e..94ea5ff 100644 --- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java +++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java @@ -89,10 +89,9 @@ @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡") private String czclfs; - @Column(name = "bzq", length = 20) + @Column(name = "bzq", length = 40) @PropertyDef(label = "淇濊川鏈�") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date bzq; + private String bzq; // @Column(name = "SPEC_", length = 50) // @PropertyDef(label = "瑙勬牸璇存槑") -- Gitblit v1.9.3