From 290a83e383a6b69bf838f0b4dc6310958dff8116 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 May 2023 15:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java
index fd2de0e..a1eab54 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sms.entity.SmsRecord;
import cn.gistack.sm.sms.service.ISmsRecordService;
+import cn.gistack.sm.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,18 @@
}
/**
+ * 自定义分页列表查询
+ * @param query 分页查询对象
+ * @param smsRecord
+ * @return
+ */
+ @ApiOperation(value="短信发送记录-自定义分页列表查询", notes="短信发送记录-自定义分页列表查询")
+ @GetMapping(value = "/page")
+ public R selectSmsRecordPage(SmsRecordVO smsRecord, Query query) {
+ return R.data(smsRecordService.selectSmsRecordPage(Condition.getPage(query), smsRecord));
+ }
+
+ /**
* 添加
*/
@ApiOperation(value="短信发送记录-添加", notes="短信发送记录-添加")
--
Gitblit v1.9.3