合并develop分支定时器功能

Conflicts:
	src/main/java/com/nis/domain/configuration/BaseCfg.java
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -70,6 +70,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	protected ScheduleCfg schedule;
 	
+	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
+	public String getCommonGroupIds() {
+		return commonGroupIds;
+	}
+	
+	public void setCommonGroupIds(String commonGroupIds) {
+		this.commonGroupIds = commonGroupIds;
+	}
+	
+	
+	
 	public String getExType() {
 		return exType;
 	}
@@ -128,13 +139,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 有效标识
 	 */
-	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90)
+	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
 	@Expose
 	protected Integer isValid;
 	/**
 	 * 是否审核
 	 */
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
 	protected Integer isAudit;
 	/**
 	 * 创建人员

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -371,7 +371,7 @@
 									<th column="userregion2" ><spring:message code="ratelimit"/></th>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
 									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<%-- <th><spring:message code="is_schduler"/></th> --%>
+									<th><spring:message code="is_schduler"/></th>
 									<th column="do_log" ><spring:message code="do_log"/></th>
 									<th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th>
@@ -426,7 +426,7 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<%-- <td class="schedulerFlag">
+									<td class="schedulerFlag">
 										<c:choose>
 											<c:when test="${not empty indexCfg.schedule }">
 												<span isScheduler="yes">
@@ -439,7 +439,7 @@
 											</c:otherwise>
 										</c:choose>
 										
-									</td> --%>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog  and indexCfg.action!=64 and indexCfg.action!=32}">