From cd56d5963f7234a03fec057d807ad1607be17c23 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:17 +0800
Subject: [PATCH] conflect
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreOrderDetails.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrderDetails.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrderDetails.java
index ed1d48b..3958875 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrderDetails.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrderDetails.java
@@ -1,5 +1,6 @@
package com.xzx.gc.entity;
+import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
import javax.persistence.Table;
@@ -11,7 +12,7 @@
**/
@Data
@Table(name = "xzx_score_order_details")
-public class ScoreOrderDetails {
+public class ScoreOrderDetails extends BaseEntity {
private String goodsName;
--
Gitblit v1.9.1