From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期五, 14 七月 2023 09:42:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 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..ee499c1 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,8 @@ package com.vci.ubcs.omd.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -16,7 +18,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 +29,7 @@ /** * 涓婚敭 */ + @TableId private String oid; /** @@ -48,7 +52,10 @@ */ private String description; - + /** + * 鏄惁鎺у埗鐗堟湰 + */ + private String revisionFlag; /** * 鐗堟湰瑙勫垯鐨勭紪鍙� */ @@ -89,6 +96,11 @@ */ private String shape; + /** + * 鏄惁鎺у埗鐢熷懡鍛ㄦ湡 + */ + private String lifeCycleFlag; + /** * 鐢熷懡鍛ㄦ湡鐨勮嫳鏂囧悕绉� */ @@ -127,7 +139,7 @@ /** * 涓氬姟绫诲瀷鍚嶇О */ - private String btmname; + private String btmName; /** * 鎷ユ湁鑰� @@ -162,15 +174,11 @@ /** * 涓氬姟绫诲瀷鎵�灞為鍩� */ - private String domain; +// @TableField("\"DOMAIN\"") + private String bizDomain; /** * 涓�鑷存�ф爣璇� */ private String consistence; - - /** - * 鏁版嵁搴撹〃涓庝笟鍔$被鍨嬪悓姝ュけ璐ユ鏁� - private Integer syncFailTimes; - */ } -- Gitblit v1.9.3