Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

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

@@ -0,0 +1,40 @@
+package com.nis.domain.configuration;
+
+
+/**
+ * 可信证书
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_cert";
+	private String issuer; //颁发者
+	private String certFile; 
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}