1、http-url添加加日志总量

2、日志添加“是否缺省显示”列
3、service_name对应的国际化优化

src/main/java/com/nis/domain/log/BaseLogEntity.java

@@ -43,7 +43,38 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识
 	protected String orderBy;//排序参数
 	
+	//新增字段
+	protected Integer encapType;//原始二层封装格式
+	protected Integer linkId;//串联设备链路号
+	protected String innerSmac;//MAC_IN_MAC的内层源MAC
+	protected String innerDmac;//MAC_IN_MAC的内层目标MAC
 	
+	
+	
+	public Integer getEncapType() {
+		return encapType;
+	}
+	public void setEncapType(Integer encapType) {
+		this.encapType = encapType;
+	}
+	public Integer getLinkId() {
+		return linkId;
+	}
+	public void setLinkId(Integer linkId) {
+		this.linkId = linkId;
+	}
+	public String getInnerSmac() {
+		return innerSmac;
+	}
+	public void setInnerSmac(String innerSmac) {
+		this.innerSmac = innerSmac;
+	}
+	public String getInnerDmac() {
+		return innerDmac;
+	}
+	public void setInnerDmac(String innerDmac) {
+		this.innerDmac = innerDmac;
+	}
 	public String getOrderBy() {
 		return orderBy;
 	}