Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!541

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -342,7 +342,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         }
         String lockKey = String.format(MARKETING_REAL_NUM_LOCK, marketing.getId());
         // 等待3秒
-        if (!distributedLocker.tryLock(lockKey, 3, 30, TimeUnit.SECONDS)) {
+        if (!distributedLocker.tryLock(lockKey, 10, 30, TimeUnit.SECONDS)) {
             throw new ServiceException("活动太火爆了,请稍后重试!");
         }