From a1fa7f56d0b99e30ada3b2f8d90c19787973fb53 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 15:14:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..11ae380 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
@@ -41,11 +41,13 @@
private Long ruleId;
private String ruleIds;
@TableField(exist = false)
- private Long[] ruleIdsArray;
+ private List<String> ruleIdsArray;
@Excel(name = "瑙勫垯")
- @TableField(exist = false)
private String ruleName;
+
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private String deductCategory;
@Excel(name = "鎸囨爣")
private String num;
@@ -72,7 +74,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 = "瀹℃牳璇存槑")
@@ -83,7 +85,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
//鏌ヨ鏉′欢
@TableField(exist = false)
--
Gitblit v1.8.0