From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
index b33f4a0..5708185 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
@@ -1,6 +1,8 @@
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciFieldType;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -11,11 +13,11 @@
/**
* 涓婚搴撳垎绫荤殑妯℃澘灞炴��
* @author ludc
- * @date 2022-1-17
+ * @date 2023-05-08
*/
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,text = "涓婚搴撳垎绫荤殑妯℃澘灞炴��",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
@Data
-@TableName("PL_CODE_CLSTEMPATTR")
+@TableName(CodeTableNameConstant.PL_CODE_CLSTEMPATTR)
@ApiModel(value = "CodeTempphase瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplateAttr extends BaseModel {
@@ -36,6 +38,7 @@
* 鎵�灞炴ā鏉垮悕绉�
*/
//@Transient(referColumn = "classifyTemplateOid.name")
+ @TableField(exist = false)
private String classifyTemplateOidName;
/**
@@ -156,6 +159,11 @@
*/
//@Column(columnDefinition = "鎵�灞炲睘鎬у垎缁�")
private String attributeGroup;
+ /**
+ * 杈撳叆鏄剧ず
+ */
+ //@Column(columnDefinition = "杈撳叆鏄剧ず")
+ private String inputTip;
/**
* 浣跨敤鏋氫妇鑻辨枃缂栧彿
@@ -211,7 +219,7 @@
* 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
*/
//@Column(columnDefinition = "灞炴�ф帶鍒惰緭鍏ョ殑闀垮害",defaultValue = "254")
- private Integer controlLength = 254;
+ private Integer controlLength;
/**
* 琛ㄥ崟涓婃樉绀虹殑鏍峰紡
@@ -351,7 +359,6 @@
*/
//Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
private String parentQueryAttr;
-
}
--
Gitblit v1.9.3