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

This commit is contained in:
yanyizhou
2021-09-14 16:41:51 +08:00
@@ -264,8 +264,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
}
@Value("${file.importFilePath}")
private String importPath;
private List<ImportDto> error = new ArrayList<>();