Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java

@@ -153,6 +153,9 @@ public class PropertyManagementController implements ResultDataResolver {
     public Result<List<String>> deleteBatch(@RequestBody List<String> ids) {
         if (CollectionUtils.isNotEmpty(ids)) {
             List<String> failedIdList = propertyManagementService.deleteBatch(ids);
+            if(CollectionUtils.isEmpty(failedIdList)){
+                return new Result<>();
+            }
             Result result = new Result<List<String>>().ok(failedIdList);
             result.setMsg("部门物业删除失败");
             result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java

@@ -37,7 +37,7 @@ public class IcPropertyManagementImportExcelData {
         /**
          * 物业名称
          */
-        @ExcelProperty(value = "物业名称")
+        @ExcelProperty(value = "*物业名称")
         private String name;
 
         /**