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

This commit is contained in:
zyx.net
2022-12-27 15:29:20 +08:00
@@ -4450,7 +4450,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
fileTemp.mkdirs();
//文件
exportFile(dataList,fileInfos);
String excelName = projectLawsInventoryEO.getExcelName();
String excelName = projectLawsInventoryEO.getExcelName()+".xlsx";
// String excelName = "";
// if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
// excelName = "法规清单.xlsx";