Merge branch 'MVP1.6.5' into develop

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java

@@ -790,7 +790,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
 				// 如果是文件夹，就创建个文件夹
 				if (!entry.isDirectory()) {
 					name = entry.getName();
-					if (Common.isNotNull(name) && (name.endsWith(".xls") || name.endsWith(".xlsx")) && (name.contains("全部") || name.contains("汇总"))) {
+					if (Common.isNotNull(name) && (name.endsWith(".xls") || name.endsWith(".xlsx")) &&
+							((type != 2 && (name.contains("全部") || name.contains("汇总"))) || (type == 2 && name.contains("单位个人缴费信息")))) {
 						is = zipFile.getInputStream(entry);
 						workbook = WorkbookFactory.create(is);
 						sheet = workbook.getSheetAt(0);