From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java
index 925f216..c545a5c 100644
--- a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61Drug.java
@@ -4,10 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +17,7 @@
 @Data
 @Entity
 @Table(name = "D_DRUG")
+@IdClass(Fz61DrugKey.class)
 public class Fz61Drug implements Serializable {
 
     public static String SORT_PROP = "id";

--
Gitblit v1.9.3