diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 4d4274aeb..d87506442 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -148,6 +148,17 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Date search_edit_time_end; protected Date search_audit_time_start; protected Date search_audit_time_end; + /** + * 配置域码 + */ + protected String cfgRegionCode; + /** + * 内容类型 + */ + protected String cfgType; + /** + * 菜单ID + */ protected Integer functionId; /** diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 5f7ec63e8..6140c00f5 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -34,24 +34,6 @@ public class BaseStringCfg extends BaseCfg { @SerializedName("keywords") protected String cfgKeywords; protected String cfgKeywordsShowName; - protected String cfgType; - - /** - * cfgType - * @return cfgType - */ - - public String getCfgType() { - return cfgType; - } - /** - * cfgKeywords - * @return cfgKeywords - */ - - public String getCfgKeywords() { - return cfgKeywords; - } /** * @param cfgKeywords the cfgKeywords to set */ diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index d1076ca7c..22435b107 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -58,22 +58,6 @@ public class ComplexkeywordCfg extends BaseCfg{ @Expose @SerializedName("isHexbin") protected Integer isHexbin ; - protected String cfgType; - - /** - * cfgType - * @return cfgType - */ - - public String getCfgType() { - return cfgType; - } - /** - * @param cfgType the cfgType to set - */ - public void setCfgType(String cfgType) { - this.cfgType = cfgType; - } /** * district * @return district diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index 530dbfc61..284a1fa6d 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -28,6 +28,7 @@ + diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 2bb8c0314..888adb930 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -34,6 +34,8 @@ + + @@ -64,6 +66,8 @@ + + diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 9dfb1af2b..17da466e9 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -26,7 +26,8 @@ - + + @@ -51,6 +52,7 @@ +