Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java

@@ -169,7 +169,7 @@ public class BPlanEnterpriseController extends BaseController {
     public void export(HttpServletResponse response, checkResultRequest req) {
         List<BPlanEnterpriseZhifaResponse> list = bPlanEnterpriseMapper.getZhifa(req);
         ExcelUtil<BPlanEnterpriseZhifaResponse> util = new ExcelUtil<BPlanEnterpriseZhifaResponse>(BPlanEnterpriseZhifaResponse.class);
-        util.exportExcel(response, list, "导出执法结果");
+        util.exportExcel( list, "导出执法结果");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -3,6 +3,7 @@ package com.ruoyi.programManagement.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
@@ -24,6 +25,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("计划企业表实体类")
+@TableName("b_plan_enterprise")
 public class BPlanEnterprise extends BaseEntity {
 
     private static final long serialVersionUID = -98531345456142440L;