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

guoshilong

2023-06-01 1611580b12c51357c3e97a725b76ea66f5a94a0f

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java

@@ -295,8 +295,6 @@
      return R.status(true);
   }



   /**
    * 发送 xx 变量模板短信
    * @param smsRequest 发送对象
@@ -315,6 +313,6 @@
    */
   @PostMapping("/sendSignMsg")
   public R sendSignMsg(@RequestBody SmsRequestTemplate smsRequest){
      return R.data(smsService.sendSignMsg(smsRequest.getTitle(),smsRequest.getContent(),smsRequest.getSmsRequest(),smsRequest.getType()));
      return R.data(smsService.sendSignMsg(smsRequest));
   }
}