Conflicts: src/main/java/com/nis/web/controller/BaseController.java
(cherry picked from commit fa7fa0c859)
fa7fa0c859