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

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java

@@ -26,7 +26,7 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 
 	@Resource
 	private OcrUsersearchchildService ocrUsersearchchildService;
-	
+
 	@Override
 	public List<OcrUsersearchchild> selectByMainId(String mainId) {
 		QueryWrapper queryWrapper = new QueryWrapper();
@@ -108,6 +108,10 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 			if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){
 				vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue());
 			}
+
+			if(SearchConfigEnum.PLANSEARCH.getId().equals(searchfield)){
+				vo.setIzplan(ocrUsersearchchild.getSearchvalue());
+			}
 		}
 		return vo;
 	}