From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/TaxesController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/TaxesController.java b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
index e491053..bc5bcdf 100644
--- a/server/company/src/main/java/com/doumee/api/business/TaxesController.java
+++ b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
@@ -92,7 +92,7 @@
@ApiOperation("鑾峰彇浼佷笟淇℃伅")
@GetMapping("/getCompanyDetail")
@RequiresPermissions("business:taxes:query")
- public ApiResponse getCompanyDetail() {
+ public ApiResponse<Taxes> getCompanyDetail() {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
@@ -126,7 +126,7 @@
@ApiOperation(value = "鑾峰彇鐩翠繚鏁版嵁淇℃伅",notes = "")
@GetMapping("/getDirectTaxes")
@RequiresPermissions("business:taxes:query")
- public ApiResponse getDirectTaxes(@RequestParam Integer id) {
+ public ApiResponse<List<TaxesInvoicingVO>> getDirectTaxes(@RequestParam Integer id) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
--
Gitblit v1.9.3