From 9a46f15cec245d1efe7c5539dc6b2f38e4980f8a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 11:48:19 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
index 23eccac..11c08ca 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
@@ -49,11 +49,30 @@
 
     @LoginNoRequired
     @PreventRepeat
-    @ApiOperation("鑷畾涔夌煭淇″唴瀹�")
-    @PostMapping("/testSendSms")
-    public ApiResponse testSendSms(@RequestBody SmsEmail smsEmail) {
+    @ApiOperation("鑷畾涔夌煭淇″唴瀹筯k")
+    @PostMapping("/testSendSmsHk")
+    public ApiResponse testSendSmsHk(@RequestBody SmsEmail smsEmail) {
         emayService.sendSmsByHk(smsEmail.getPhone(),smsEmail.getContent());
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
+
+
+    @LoginNoRequired
+    @PreventRepeat
+    @ApiOperation("鑷畾涔夌煭淇″唴瀹�")
+    @PostMapping("/testSendSms")
+    public ApiResponse testSendSms(@RequestBody SmsEmail smsEmail) {
+        smsEmailService.sendBillSms(smsEmail.getContent(),smsEmail.getPhone(),null);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+    @LoginNoRequired
+    @PreventRepeat
+    @ApiOperation("鑷畾涔夐偖浠跺唴瀹�")
+    @PostMapping("/testSendEmail")
+    public ApiResponse testSendEmail(@RequestBody SmsEmail smsEmail) {
+        smsEmailService.sendEmail(smsEmail.getEmail(),smsEmail.getContent(),null);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
 }

--
Gitblit v1.9.3