Merge remote-tracking branch 'origin/main'

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

@@ -159,7 +159,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(response, list, "导出执法结果");
     }
 
     /**
@@ -170,7 +170,7 @@ public class BPlanEnterpriseController extends BaseController {
     public void exportplan(HttpServletResponse response, BPlanEnterprise bPlanEnterprise) {
         List<BPlanEnterpriseResponse> list = bPlanEnterpriseService.selectBPlanEnterpriseList(bPlanEnterprise);
         ExcelUtil<BPlanEnterpriseResponse> util = new ExcelUtil<BPlanEnterpriseResponse>(BPlanEnterpriseResponse.class);
-        util.exportExcel(list, "计划管理数据");
+        util.exportExcel(response, list, "计划管理数据");
     }
 
     /**

ruoyi-admin/src/main/resources/application-druid.yml

@@ -11,13 +11,13 @@ spring:
 #                username: root
 #                password: Admin123@
             #本地
-#                url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: adminadmin
-                #远程
-                url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
                 username: root
-                password: Jichuang@2023
+                password: adminadmin
+                #远程
+#                url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
+#                username: root
+#                password: Jichuang@2023
             #公司本地
 #                url: jdbc:mysql://localhost:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root