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

Browse Source

into develop

Conflicts:
	src/main/java/com/nis/web/service/BaseService.java
	asn group中修改组织变更和asn no变更，不重新获取groupId逻辑
	ip addr 的asn 修改为手动输入，后台check
	app ip和asn ip配置取消，取消分组中最后一条配置时，失效整个compile，并且修改groupId的状态为为无效。
	无效的asn group删除时，删除其下的所有asn ip

...

This commit is contained in:

duandongmei

2019-01-18 11:14:05 +06:00

parent b883c3b937 ed77da00c4

commit 43f947fd69

70 changed files with 871 additions and 3911 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3451

src/main/java/com/nis/web/service/BaseService.java

File diff suppressed because it is too large Load Diff