Merge remote-tracking branch 'origin/checkAddTime' into release

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -38,6 +38,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -509,7 +510,7 @@ public class SDNYMainProcessController extends AbstractController {
         boolean isLock = false;
         RLock lock = redisson.getLock(lockKey);
         try {
-            isLock = lock.tryLock();
+            isLock = lock.tryLock(600, TimeUnit.SECONDS);
 
             if (!isLock) {
                 log.info("当前已有线程获取到锁");