Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -522,7 +522,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         result.put("status", HttpStatus.OK.value());
         result.put("message", "反馈成功!");
 
+<<<<<<< HEAD
         RLock lock = redissonClient.getLock("acs_to_deviceApply_wms:" + type);
+=======
+        RLock lock = redissonClient.getLock("AcsToWmsServiceImpl_deviceApply:" + type);
+>>>>>>> 977110a29f1889255889822be9a0ba275ad2fde6
         boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
 
         try {