From c6a54f63df671de4592e336b9b8cd8406d4e3b51 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 02 六月 2023 16:25:27 +0800
Subject: [PATCH] 解决动态模块冲突
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
index 141f7ef..89e6ada 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.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;
@@ -16,7 +17,8 @@
@Data
@TableName("pl_omd_btm_type")
@ApiModel(value = "涓氬姟绫诲瀷", description = "涓氬姟绫诲瀷")
-public class BtmType implements java.io.Serializable{
+public class
+BtmType implements java.io.Serializable{
/**
@@ -26,6 +28,7 @@
/**
* 涓婚敭
*/
+ @TableId
private String oid;
/**
@@ -48,7 +51,10 @@
*/
private String description;
-
+ /**
+ * 鏄惁鎺у埗鐗堟湰
+ */
+ private String revisionFlag;
/**
* 鐗堟湰瑙勫垯鐨勭紪鍙�
*/
@@ -89,6 +95,11 @@
*/
private String shape;
+ /**
+ * 鏄惁鎺у埗鐢熷懡鍛ㄦ湡
+ */
+ private String lifeCycleFlag;
+
/**
* 鐢熷懡鍛ㄦ湡鐨勮嫳鏂囧悕绉�
*/
@@ -127,7 +138,7 @@
/**
* 涓氬姟绫诲瀷鍚嶇О
*/
- private String btmname;
+ private String btmName;
/**
* 鎷ユ湁鑰�
@@ -168,9 +179,4 @@
* 涓�鑷存�ф爣璇�
*/
private String consistence;
-
- /**
- * 鏁版嵁搴撹〃涓庝笟鍔＄被鍨嬪悓姝ュけ璐ユ鏁�
- private Integer syncFailTimes;
- */
}
--
Gitblit v1.9.3