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/java/com/nis/web/controller/configuration/ntc/IpController.java
	限速模板增加ratelimit字段，修改导出protocol注释信息
This commit is contained in:
duandongmei
2018-10-17 11:10:50 +08:00
parent 2b1192df3e aa690069bd
commit 94cb4fc9e4
20 changed files with 719 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/configuration/template/IpRateLimitTemplate.java
View File

@@ -9,7 +9,7 @@ import com.nis.util.excel.ExcelField;
public class IpRateLimitTemplate extends IpAllTemplate {
private String userRegion1;
@ExcelField(title="rate_limte",align=2,sort=2)
@ExcelField(title="ratelimit",dictType="RATE_LIMIT",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}