Merge branch 'dev_neo3' into 'dev'

[revert] revert change bb item to single ds

See merge request root/atms!107

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -540,12 +540,12 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
                         .filter(y -> y.getItem1().equals(a.getCellTemplateID())).collect(Collectors.toList());
                 List<DataSourceDto> dataSourceDtoList = new ArrayList<>();
                 entryList.forEach(z -> {
-                    if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) {
-                        z.getItem2().getItems().forEach(m -> {
-                            ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class);
-                            dataSourceDtoList.add(dto);
-                        });
-                    } else
+//                    if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) {
+//                        z.getItem2().getItems().forEach(m -> {
+//                            ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class);
+//                            dataSourceDtoList.add(dto);
+//                        });
+//                    } else
                         dataSourceDtoList.add(z.getItem2());
                 });
                 cellDataDto.setDataSourceList(dataSourceDtoList);