合并 master 分支的代码

src/main/java/cn/iocoder/dashboard/framework/sms/client/SmsClient.java

@@ -24,7 +24,7 @@ public interface SmsClient {
      */
     SmsResult send(String templateApiId, SmsBody smsBody, String targets);
 
-
+    // TODO FROM 芋艿 to ZZF：是不是可以改成意图更明确的解析返回结果，例如说 parseXXXX
     /**
      * 短信发送回调请求处理
      *
@@ -33,4 +33,4 @@ public interface SmsClient {
      */
     SmsResultDetail smsSendCallbackHandle(ServletRequest request) throws Exception;
 
-}
+}

src/main/java/cn/iocoder/dashboard/framework/sms/core/SmsClientFactory.java

@@ -115,7 +115,6 @@ public class SmsClientFactory {
      * @return 第三方平台短信唯一标识
      */
     public SmsResultDetail getSmsResultDetailFromCallbackQuery(ServletRequest callbackRequest) {
-
         for (Long channelId : smsSenderMap.keySet()) {
             AbstractSmsClient smsClient = smsSenderMap.get(channelId);
             try {