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/CodeClassify.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
index cf9eb71..f882c6a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -15,7 +16,7 @@
*/
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY,text = "涓婚搴撳垎绫�",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
@Data
-@TableName("PL_CODE_CLASSIFY")
+@TableName(CodeTableNameConstant.PL_CODE_CLASSIFY)
@ApiModel(value = "CodeClassify瀵硅薄", description = "涓婚搴撶殑鍒嗙被")
@EqualsAndHashCode(callSuper = true)
public class CodeClassify extends BaseModel {
@@ -88,6 +89,11 @@
private String codeResembleRuleOid;
/**
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
+ */
+ private Integer isParticipateCheck;
+
+ /**
* 鐩镐技椤规煡璇㈣鍒欏悕绉�
*/
@Transient(referColumn = "codeResembleRuleOid.name")
@@ -122,4 +128,10 @@
@TableField(exist = false)
private String idPath;
+ /**
+ * 璇ュ垎绫讳笅涓绘暟鎹�绘暟
+ */
+ @TableField(exist = false)
+ private String total;
+
}
--
Gitblit v1.9.3