From 9834270f97f63dd46cb4aa845cd6b63f1c9382a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 11:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
index 9833fce..4937684 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
@@ -41,7 +41,7 @@
* 门店积分统计
*/
@GetMapping("/statistics")
- @ApiModelProperty("门店积分统计")
+ @ApiModelProperty(value = "门店积分统计")
public R<ShopPointStatistics> statistics(ShopPoint shopPoint) {
ShopPointStatistics statistics = shopPointService.statistics(Page.of(shopPoint.getPageNum(), shopPoint.getPageSize()), shopPoint);
return R.ok(statistics);
@@ -51,7 +51,7 @@
* 导出门店积分统计
*/
@GetMapping("/export")
- @ApiModelProperty("导出门店积分统计")
+ @ApiModelProperty(value = "导出门店积分统计")
public void export(HttpServletResponse response , ShopPoint shopPoint) {
ShopPointStatistics statistics = shopPointService.statistics(Page.of(1, Integer.MAX_VALUE), shopPoint);
if (statistics!=null){
--
Gitblit v1.7.1