From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
index 773ed7e..fbe5669 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItem.java
@@ -3,10 +3,7 @@
import com.bstek.dorado.annotation.PropertyDef;
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;
/**
@@ -21,6 +18,7 @@
@Data
@Entity
@Table(name = "D_CHECK_ITEM")
+@IdClass(Fz35CheckItemKey.class)
public class Fz35CheckItem implements Serializable {
/**
@@ -33,10 +31,12 @@
@PropertyDef(label = "妫�娴嬬紪鐮�")
private String checkId;
+ @Id
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+ @Id
@Column(name = "STANDARD_ID_", length = 40)
@PropertyDef(label = "妫�娴嬮」缂栫爜")
private String standardId;
--
Gitblit v1.9.3