Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/java/com/nis/domain/SysLog.java

@@ -34,6 +34,8 @@ public class SysLog extends BaseEntity<SysLog>{
     
     private Long consumerTime;//消费时间
     
+    private Integer functionId;//功能菜单id
+    
     public Long getConsumerTime() {
 		return consumerTime;
 	}
@@ -155,7 +157,15 @@ public class SysLog extends BaseEntity<SysLog>{
 		this.createBy = createBy;
 	}
     
-    /**
+    public Integer getFunctionId() {
+		return functionId;
+	}
+
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+
+	/**
 	 * 设置请求参数
 	 * @param paramMap
 	 */