From ce7964aba19721cebdd9eb7d475ac651a6dca6bf Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 09:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 0e1fca8..190042a 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
@@ -11,7 +11,6 @@
import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* 鍚堝悓鎵撳垎瀵硅薄 t_default_score
@@ -44,8 +43,10 @@
private Long[] ruleIdsArray;
@Excel(name = "瑙勫垯")
- @TableField(exist = false)
private String ruleName;
+
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private String deductCategory;
@Excel(name = "鎸囨爣")
private String num;
@@ -72,7 +73,7 @@
@Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date auditingTime;
- @Excel(name = "瀹℃牳鐘舵��")
+ @Excel(name = "瀹℃牳鐘舵��", readConverterExp = "PASS=閫氳繃,NO_PASS=鏈�氳繃,WAIT=寰呭鏍�")
private AuditingStatus auditingStatus;
@Excel(name = "瀹℃牳璇存槑")
--
Gitblit v1.8.0