From 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 15:36:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/business/WxBillController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
index b2cd2f2..0167cfa 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
@@ -43,7 +43,7 @@
@PreventRepeat
@ApiOperation("鎵嬪姩鍚屾寰俊鏌愬ぉ璐﹀崟淇℃伅")
@PostMapping("/syncWxBill")
- @RequiresPermissions("business:wxbill:create")
+// @RequiresPermissions("business:wxbill:create")
public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
wxBillService.getWxBill(wxBill.getCreateDate());
return ApiResponse.success(wxBillService.create(wxBill));
@@ -78,9 +78,9 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("寰俊瀵硅处姹囨�籣鍒嗛〉鏌ヨ")
@PostMapping("/page")
-// @RequiresPermissions("business:wxbill:query")
+ @RequiresPermissions("business:wxbill:query")
public ApiResponse<PageData<WxBill>> findPage (@RequestBody PageWrap<WxBill> pageWrap) {
return ApiResponse.success(wxBillService.findPage(pageWrap));
}
@@ -92,9 +92,9 @@
ExcelExporter.build(WxBill.class).export(wxBillService.findPage(pageWrap).getRecords(), "WxBillController", response);
}
- @ApiOperation("寰俊瀵硅处鏄庣粏缁熻鏌ヨ")
- @PostMapping("/getTotalBill")
-// @RequiresPermissions("business:wxbilldetail:query")
+ @ApiOperation("寰俊瀵硅处鏄庣粏_鏌ヨ")
+ @PostMapping("/getTotalBillDetail")
+ @RequiresPermissions("business:wxbilldetail:query")
public ApiResponse<List<WxBill>> getTotalBill (@RequestBody WxBill param) {
return ApiResponse.success(wxBillService.getTotalBill(param));
}
--
Gitblit v1.9.3