Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

@@ -0,0 +1,77 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+public class FunctionRegionDict {
+	private Integer dictId;
+	private Integer functionId;
+	private String configRegion;
+	private String configDistrict;
+	private String configDesc;
+	private Integer isValid;
+	private Integer creatorId;
+	private Date creatTime;
+	private Integer editorId;
+	private Date editTime;
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public String getConfigRegion() {
+		return configRegion;
+	}
+	public void setConfigRegion(String configRegion) {
+		this.configRegion = configRegion;
+	}
+	public String getConfigDistrict() {
+		return configDistrict;
+	}
+	public void setConfigDistrict(String configDistrict) {
+		this.configDistrict = configDistrict;
+	}
+	public String getConfigDesc() {
+		return configDesc;
+	}
+	public void setConfigDesc(String configDesc) {
+		this.configDesc = configDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+	public Date getCreatTime() {
+		return creatTime;
+	}
+	public void setCreatTime(Date creatTime) {
+		this.creatTime = creatTime;
+	}
+	public Integer getEditorId() {
+		return editorId;
+	}
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	
+}

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

@@ -0,0 +1,91 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+public class FunctionServiceDict {
+	private Integer dictId;
+	private Integer functionId;
+	private Integer protocolId;
+	private Integer action;
+	private Integer serviceId;
+	private String serviceName;
+	private String serviceDesc;
+	private Integer isValid;
+	private Integer creatorId;
+	private Date creatTime;
+	private Integer editorId;
+	private Date editTime;
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public Integer getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(Integer protocolId) {
+		this.protocolId = protocolId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceName() {
+		return serviceName;
+	}
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+	public Date getCreatTime() {
+		return creatTime;
+	}
+	public void setCreatTime(Date creatTime) {
+		this.creatTime = creatTime;
+	}
+	public Integer getEditorId() {
+		return editorId;
+	}
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	
+}