From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
index c69d8c3..95ee245 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.Alias;
+import javax.validation.constraints.NotBlank;
import java.sql.Clob;
/**
@@ -18,7 +21,7 @@
* @date 2022-1-18
*/
@Data
-@TableName("PL_CODE_BASICSEC")
+@TableName(CodeTableNameConstant.PL_CODE_BASICSEC)
@ApiModel(value = "CodeBasicSec瀵硅薄", description = "鐮佹鍩虹淇℃伅")
@EqualsAndHashCode(callSuper = true)
public class CodeBasicSec extends BaseModel {
@@ -31,16 +34,19 @@
/**
* 鐮佹淇℃伅
*/
+ @NotBlank(message = "鐮佹淇℃伅涓嶈兘涓虹┖")
private String id;
/**
* 鐮佹鍚嶇О
*/
+ @NotBlank(message = "鐮佹鍚嶇О涓嶈兘涓虹┖")
private String name;
/**
* 鐮佹绫诲瀷
*/
+ @NotBlank(message = "鐮佹绫诲瀷涓嶈兘涓虹┖")
private String secType;
/**
@@ -53,6 +59,7 @@
/**
* 鎵�灞炵紪鐮佽鍒�
*/
+ @NotBlank(message = "鎵�灞炵紪鐮佽鍒欎笉鑳戒负绌�")
private String pkCodeRule;
/**
@@ -231,6 +238,15 @@
private String customCodeSerialClass;
/**
+ * 鑷畾涔夌殑娴佹按绠楁硶绫�
+ */
+ private String customCodeSerialClassText;
+
+ /***
+ * 鑷畾涔夋祦姘寸被鍨�
+ */
+ private String customCodeSerialType;
+ /**
* 鏄惁鑷姩鍖归厤鍒嗙被鍊�
*/
//@VciFieldType(VciFieldTypeEnum.VTBoolean)
@@ -274,8 +290,18 @@
private String displayFlag;
/**
- * 娴佹按渚濊禆椤哄簭
+ * 娴佹按渚濊禆椤哄簭 TODO:鏈潵鏄敤鏉ヨ绠楁祦姘存帓搴忕殑锛屽悗闈㈠洜涓烘煇浜涘師鍥犳敼鐢╫rderNum浜�
*/
private Integer serialDependOrder;
+ /**
+ * 鍓嶇紑
+ */
+ private String prefixCode;
+
+ /**
+ * 鍚庣紑
+ */
+ private String suffixCode;
+
}
--
Gitblit v1.9.3