gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	excel导入提示信息补全，单个字典数据不需要导入
	去掉是否表达式的导入，根据关键词单个和多个区分
This commit is contained in:
duandongmei
2018-10-23 14:14:08 +08:00
parent 5af5a042ae a4ff9ae493
commit 3e1d14602e
84 changed files with 908 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/domain/configuration/template/ComplexStringAllTemplate.java
View File

@@ -18,7 +18,6 @@ public class ComplexStringAllTemplate {
private String district;
private String cfgKeywords;
private Integer exprType ;
private Integer matchMethod ;
private Integer isHex;
private Integer isCaseInsenstive;
@@ -44,13 +43,6 @@ public class ComplexStringAllTemplate {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=13)
public Integer getExprType() {
return exprType;
}
public void setExprType(Integer exprType) {
this.exprType = exprType;
}
@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=14)
public Integer getMatchMethod() {
return matchMethod;