From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 十一月 2023 17:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/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