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

This commit is contained in:
qianshijiang
2025-11-11 14:44:58 +08:00

View File

@@ -182,7 +182,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
// tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> { // tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> {
// if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) { // if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) {
//// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy()); // tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy());
// tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy()); // tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy());
// } // }
// })); // }));