Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@@ -83,7 +83,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
         }
         RLock lock = null;
         try {
-            lock = distributedLock.getLock(String.format("lock:open_data_patrol:%s", msgObj.getPatrolId()),
+            lock = distributedLock.getLock(String.format("lock:open_data_patrol:%s:%s",tags, msgObj.getObjectId()),
                     30L, 30L, TimeUnit.SECONDS);
             UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm();
             patrolRecordForm.setCustomerId(msgObj.getCustomerId());