Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java