From 26b03b6720fe222be3fdad7931a94a4842dca0c2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 11:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
index 9b0f1d8..27f0087 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
@@ -43,8 +43,10 @@
private Long[] ruleIdsArray;
@Excel(name = "瑙勫垯")
- @TableField(exist = false)
private String ruleName;
+
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private String deductCategory;
@Excel(name = "鎸囨爣")
private String num;
@@ -82,7 +84,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
//鏌ヨ鏉′欢
@TableField(exist = false)
--
Gitblit v1.8.0