From cf09e9b2b7e1a42224ba7e992ea73693fa6848b5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 17:31:13 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
index fcbe968..f04e981 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
@@ -40,10 +40,9 @@
PageInfo<TInvoiceType> pageInfo = invoiceTypeService.pageList(pageList);
return AjaxResult.success(pageInfo);
}
- @ResponseBody
@GetMapping("/pageListR")
@ApiOperation(value = "获取开票公司和类型列表", tags = {"管理后台-发票管理"})
- public R<List<TInvoiceType>> pageListR( String company){
+ public R<List<TInvoiceType>> pageListR(String company){
List<TInvoiceType> list = new ArrayList<>();
if (StringUtils.hasLength(company)){
list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, company).list();
--
Gitblit v1.7.1