From 238b068ec5267184f0d0a450c5f37dccf2cc60ad Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 19 十二月 2018 16:33:43 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
index 9846ce6..8d6a9fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
@@ -82,6 +82,8 @@
 	@org.yeshi.utils.mybatis.Column(name="auditRole")
 	private String auditRole; //瀹℃牳浜�
 	
+	@Expose // 椋庨櫓绛夌骇
+	private int warnLevel;
 	
 	public String getAuditRole() {
 		return auditRole;
@@ -170,6 +172,14 @@
 	public void setAuditTime(Long auditTime) {
 		this.auditTime = auditTime;
 	}
+
+	public int getWarnLevel() {
+		return warnLevel;
+	}
+
+	public void setWarnLevel(int warnLevel) {
+		this.warnLevel = warnLevel;
+	}
 	
 	
 }

--
Gitblit v1.8.0