From cebbcb63dfd7c9599868959c7fc36f16ed3b1911 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 24 四月 2024 13:54:11 +0800
Subject: [PATCH] 合同导入模板生成、导入合同及规则、合同规则展示
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 5b750d4..b6af342 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
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.TreeEntity;
import com.ycl.system.domain.TreeNode;
+import enumeration.converter.RuleDeductCategoryConverter;
+import enumeration.general.RuleDeductCategoryEnum;
import lombok.Data;
import java.util.Date;
@@ -61,10 +63,10 @@
private String ruleCondition;
/**
- * 鎵ｅ噺鏂瑰紡 1/2/3 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+ * 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
*/
- @ExcelProperty("鎵ｅ垎鏂瑰紡")
- private String deductCategory;
+ @ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
+ private RuleDeductCategoryEnum deductCategory;
/**
* 鎵ｉ櫎鍒嗘暟
--
Gitblit v1.8.0