From 67683967e7be0e899ced1d460e53080b5098859d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 23 四月 2024 18:05:53 +0800
Subject: [PATCH] 合同导入、规则、展示

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
index c554b6c..5b750d4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
@@ -6,8 +6,12 @@
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ycl.system.domain.TreeEntity;
+import com.ycl.system.domain.TreeNode;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
@@ -18,7 +22,8 @@
 @Data
 @ExcelIgnoreUnannotated
 @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
-public class CalculateRule extends TreeEntity {
+@TableName("t_calculate_rule")
+public class CalculateRule extends TreeNode {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -28,9 +33,9 @@
     private Long id;
 
     /**
-     * 鍗曚綅id
+     * 鍚堝悓id
      */
-    private Integer unitId;
+    private Integer contractId;
 
     /**
      * 瑙勫垯鍚嶇О
@@ -73,7 +78,10 @@
     @ExcelProperty("闄や互鏁伴噺")
     private Integer calcUnit;
 
+    private Date createTime;
+    private Date updateTime;
+
     @TableLogic
-    private String deleted;
+    private Integer deleted;
 
 }

--
Gitblit v1.8.0