From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
index 9e1e620..785b2f9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.entity;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -10,8 +11,8 @@
/**
*
* 閾炬帴绫诲瀷鍖呭惈鐨勫睘鎬�
- * @author weidy
- * @date 2019/10/11 3:21 PM
+ * @author LiHang
+ * @date 2023/5/24
*/
@Data
@TableName("pl_omd_link_type_attr")
@@ -26,6 +27,7 @@
/**
* 涓婚敭
*/
+ @TableId
private String oid;
/**
@@ -107,7 +109,7 @@
/**
* 涓氬姟绫诲瀷鍚嶇О
*/
- private String btmname;
+ private String btmName;
/**
* 鎷ユ湁鑰�
--
Gitblit v1.9.3