Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SendSmsController.java

@@ -25,9 +25,10 @@ public class SendSmsController {
     @GetMapping("/{phone}")
     public AjaxResult sendSms(String phone) {
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("code", SendSmsUtils.getCode(4));
+        String code = SendSmsUtils.getCode(4);
+        jsonObject.put("code", code);
         SendSmsUtils.sendSms(phone,"SMS_219525380",jsonObject.toString());
-        return AjaxResult.success();
+        return AjaxResult.success(code);
     }