From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
index 24ec670..0a703e8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
@@ -1,44 +1,52 @@
package com.ycl.platform.domain.entity;
+import annotation.Excel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
+import com.ycl.system.entity.BaseEntity;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
import java.math.BigDecimal;
/**
- * @author锛歺p
- * @date锛�2024/3/8 9:18
+ * 鑰冩牳妯℃澘-瑙勫垯涓棿瀵硅薄 t_check_template_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Data
@Accessors(chain = true)
@TableName("t_check_template_rule")
-@ApiModel(value = "CheckTemplate瀵硅薄", description = "鑰冩牳妯℃澘")
-public class CheckTemplateRule {
+public class CheckTemplateRule
+{
+ private static final long serialVersionUID = 1L;
+ /** */
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
- /**
- * 妯℃澘ID
- */
+ /** 鑰冩牳妯℃澘 */
+ @Excel(name = "鑰冩牳妯℃澘")
@TableField("check_template_id")
private Integer checkTemplateId;
- /**
- * 瑙勫垯ID
- */
+ /** 鑰冩牳瑙勫垯 */
+ @Excel(name = "鑰冩牳瑙勫垯")
@TableField("check_rule_id")
private Integer checkRuleId;
- /**
- * 鏉冮噸
- */
+ /** 瑙勫垯鏉冮噸 */
+ @Excel(name = "瑙勫垯鏉冮噸")
@TableField("weight")
private BigDecimal weight;
+ @TableField(exist = false)
+ private String checkRuleName;
+ @TableField(exist = false)
+ private String ruleIndex;
}
--
Gitblit v1.8.0