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

# Conflicts:
#	yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java

@@ -390,7 +390,6 @@ public class SmsSendServiceImpl implements SmsSendService {
         if ((Objects.isNull(businessProperties) || !businessProperties.isDebug()) && smsChannel.getStatus() == 0) {
             smsProducer.sendSmsSendMessageV2(smsSendMessage);
         }
-
         return sendLogId;
     }