From 6732cd7a4e0fd7ea083d4ae11254bde35adb1ee4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:39:20 +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/CodeRule.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index 53d85f1..9099f3d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -16,12 +16,14 @@
  */
 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 io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 缂栫爜瑙勫垯 瀹炰綋绫�
@@ -30,7 +32,7 @@
  * @since 2023-04-03
  */
 @Data
-@TableName("PL_CODE_RULE")
+@TableName(CodeTableNameConstant.PL_CODE_RULE)
 @ApiModel(value = "CodeRule瀵硅薄", description = "缂栫爜瑙勫垯")
 @EqualsAndHashCode(callSuper = true)
 public class CodeRule extends BaseModel {
@@ -43,11 +45,13 @@
 	/**
 	 * 瑙勫垯缂栧彿
 	 */
+	@NotBlank(message = "瑙勫垯缂栧彿涓嶈兘涓虹┖")
 	private String id;
 
 	/**
 	 * 瑙勫垯鐨勫悕绉�
 	 */
+	@NotBlank(message = "瑙勫垯鐨勫悕绉颁笉鑳戒负绌�")
 	private String name;
 
 	/**
@@ -55,4 +59,20 @@
 	 */
 	private String description;
 
+	/**
+	 * 渚濇嵁
+	 */
+	@NotBlank(message = "瑙勫垯渚濇嵁涓嶈兘涓虹┖")
+	private String accordingTo;
+
+	/**
+	 * 鍩虹鐮佹鐨勭爜娈电被鍨嬮『搴忔嫾鎺ヨ�屾垚鐨勫瓧绗︿覆
+	 */
+	private String basicSecTypes;
+
+	/**
+	 * 鎵�鏈夎�呭湪鐣岄潰鏄剧ず鍐呭锛堣处鍙凤紙鐢ㄦ埛鍚嶏級锛�
+	 */
+	private String ownerText;
+
 }

--
Gitblit v1.9.3