From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +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 | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 0292e2c..abccfd4 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,10 +16,15 @@
*/
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;
/**
* 缂栫爜瑙勫垯 瀹炰綋绫�
@@ -28,7 +33,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 {
@@ -41,11 +46,13 @@
/**
* 瑙勫垯缂栧彿
*/
+ @NotBlank(message = "瑙勫垯缂栧彿涓嶈兘涓虹┖")
private String id;
/**
* 瑙勫垯鐨勫悕绉�
*/
+ @NotBlank(message = "瑙勫垯鐨勫悕绉颁笉鑳戒负绌�")
private String name;
/**
@@ -53,4 +60,15 @@
*/
private String description;
+ /**
+ * 渚濇嵁
+ */
+ @NotBlank(message = "瑙勫垯渚濇嵁涓嶈兘涓虹┖")
+ private String accordingTo;
+
+ /**
+ * 鍩虹鐮佹鐨勭爜娈电被鍨嬮『搴忔嫾鎺ヨ�屾垚鐨勫瓧绗︿覆
+ */
+ private String basicSecTypes;
+
}
--
Gitblit v1.9.3