From 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 12 May 2021 14:34:00 +0800 Subject: [PATCH] conflect --- src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java index c99efc0..28aaa4e 100644 --- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java +++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java @@ -1,5 +1,6 @@ package com.xcong.excoin.modules.yunding.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.xcong.excoin.common.system.base.BaseEntity; import lombok.Data; @@ -92,5 +93,7 @@ private Date endTime; + @TableField(exist = false) + private YdProductEntity ydProductEntity; } -- Gitblit v1.9.1