From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 5 +----
1 files changed, 1 insertions(+), 4 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..0887bf8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
@@ -17,20 +17,17 @@
@Data
@Entity
@Table(name = "D_DRUG")
-@IdClass(Fz40DrugKey.class)
public class Fz40Drug implements Serializable {
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
private String id;
- @Id
@Column(name = "DEPT_ID_", length = 50)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Id
@Column(name = "cgrq")
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
--
Gitblit v1.9.3