处理代码合并问题

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java

@@ -188,7 +188,6 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
 		return page;
 	}
 
-    /**
 	private String getRegion(ParamsExportTemplateEO paramsExportTemplateEO, List<DictModel> regionList, ParamsExportTemplateEO exportTemplateEO) {
 		//适用地区
 		List<DictModel> dictModelList = new ArrayList<>();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java

@@ -98,7 +98,6 @@ public class ParamsExportTemplateEO implements Serializable {
     private String orderByField; // 字段
 
     //适用地区
-    private String region;
     @TableField(exist = false)
     private String regionName;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -406,7 +406,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		//数据字典
 		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
 		//技术领域处理
-		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
+		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems);
 		log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime));
 		this.dataDicDispose(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut());
 		log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime));

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

@@ -977,7 +977,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				result = attestationRankSort(orderBy,orderByField,result,list);
 			}
 		}
-		log.info("四阶段消耗时间：" + (System.currentTimeMillis() - startTime));
 		return result;
 	}