合并代码

puzhibing

2024-09-10 cf09e9b2b7e1a42224ba7e992ea73693fa6848b5

 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();