Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -5621,6 +5621,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         fieldListQuery.add("title");
         fieldListQuery.add("title_en");
         fieldListQuery.add("state");
+        fieldListQuery.add("region");
         fieldListQuery.add("technology_territory");
         fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
         fieldListQuery.add("implement_time");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -506,7 +506,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				nowFile.delete();
 			}
 			nowFile.mkdirs();
-			HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
+			String excelName = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				excelName = "相关人员名单";
+			}else{
+				excelName = "Personal List";
+			}
+			HSSFSheet sheet = workbook.createSheet(excelName);
 			sheet.setDefaultColumnWidth(16);//列宽
 			HSSFCellStyle cellStyle = workbook.createCellStyle();
 			cellStyle.setWrapText(true);//自动换行