Merge branch 'dev' into test

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentHouseController.java

@@ -1,5 +1,6 @@
 package com.epmet.plugin.power.modules.rent.controller;
 
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -75,6 +76,11 @@ public class RentHouseController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentHouseDTO> list = rentHouseService.list(params);
+        if(CollectionUtils.isEmpty(list)){
+            RentHouseDTO dto = new RentHouseDTO();
+            dto.setId("");
+            list.add(dto);
+        }
         ExcelUtils.exportExcelToTarget(response, null, list, RentHouseExcel.class);
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.6__pli_rent_house.sql

@@ -0,0 +1,25 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : epmet_test_user
+ Source Server Type    : MySQL
+ Source Server Version : 50732
+ Source Host           : 118.190.150.119:13306
+ Source Schema         : epmet_pli_power
+
+ Target Server Type    : MySQL
+ Target Server Version : 50732
+ File Encoding         : 65001
+
+ Date: 13/05/2022 10:53:09
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for pli_rent_tenant_info
+-- ----------------------------
+
+
+ALTER TABLE pli_rent_house MODIFY COLUMN COMMUNITY_ID VARCHAR(32) DEFAULT NULL ;

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.6__pli_rent_house_update.sql

@@ -1 +0,0 @@
-ALTER TABLE epmet_pli_power.pli_rent_house MODIFY COLUMN COMMUNITY_ID varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '社区ID';