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/CodeClassifyTemplateButton.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
index 17350ae..d890b89 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
@@ -16,7 +16,9 @@
  */
 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -30,30 +32,45 @@
  * @since 2023-04-20
  */
 @Data
-@TableName("PL_CODE_TEMPBUTTON")
+@TableName(CodeTableNameConstant.PL_CODE_TEMPBUTTON)
 @ApiModel(value = "CodeTempbutton瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍")
 @EqualsAndHashCode(callSuper = true)
 public class CodeClassifyTemplateButton extends BaseModel {
 
 	/**
-	 *
+	 * 鎵�灞炴ā鏉�
 	 */
 	@ApiModelProperty(value = "")
-	private String classifytemplateoid;
+	private String classifyTemplateOid;
+
 	/**
-	 *
+	 * 鎸夐挳鐨勪富閿�
 	 */
 	@ApiModelProperty(value = "")
-	private String classifybuttonoid;
+	private String classifyButtonOid;
+
 	/**
-	 *
+	 * 鎸夐挳鐢ㄩ��
 	 */
 	@ApiModelProperty(value = "")
-	private String buttonuse;
+	private String buttonUse;
+
 	/**
 	 *
 	 */
 	@ApiModelProperty(value = "")
 	private Integer orderNum;
 
+	/**
+	 * 鎵�灞炴寜閽畁ame
+	 */
+	@TableField(exist = false)
+	private String classifyButtonOidName;
+
+	/**
+	 * 鎵�灞炴寜閽甶d
+	 */
+	@TableField(exist = false)
+	private String classifyButtonId;
+
 }

--
Gitblit v1.9.3