k18-ntcs-web-ntc

Archived

This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

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

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

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