Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

This commit is contained in:
zhangwenqing
2019-06-10 18:32:17 +08:00
2 changed files with 12 additions and 2 deletions

View File

@@ -20,9 +20,16 @@ public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
private String certFile;
@ExcelField(title="crl_file",sort=4)
private String crlFile;
@ExcelField(title="built_in",sort=4)//是否内置证书
private Integer builtIn;
private Integer builtIn;//是否内置证书
@ExcelField(title="built_in",sort=5)//是否内置证书(导出用)
private String builtInExp;
public String getBuiltInExp() {
return builtInExp;
}
public void setBuiltInExp(String builtInExp) {
this.builtInExp = builtInExp;
}
public String getCrlFile() {
return crlFile;
}