diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 183f3be61..0cadc60ea 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -70,6 +70,17 @@ public class BaseCfg extends BaseEntity 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 extends BaseEntity 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; /** * 创建人员 diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 566cefb48..1bf9dda95 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -371,7 +371,7 @@ - <%-- --%> + @@ -426,7 +426,7 @@ - <%-- + @@ -439,7 +439,7 @@ - --%> +