Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -651,8 +651,10 @@ public class IcResiUserController implements ResultDataResolver {
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
 
                 //解锁
+                if (lock != null) {
                     lock.unlock();
                 }
+            }
         });
 
         return new Result();