Merge branch 'master_after0423' into master_after0506

# Conflicts:
#	xingyun-sc/src/main/resources/templates/purchaseOrderTemplate.xlsx
#	xingyun-sc/src/main/resources/templates/purchaseOrderTemplateForProduction.xlsx

@@ -190,9 +190,9 @@ public class BusinessDataExportHandler implements ExportHandler {
                     BigDecimal totalQuantity = BigDecimal.ZERO;
                     List<PurchaseOrderLine> purchaseOrderLineList = orderLineMap.get(orderInfo.getId());
                     if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) {
-                        for (int i = startRow + 1; i < startRow + purchaseOrderLineList.size(); i++) {
-                            ExcelUtil.copyRow(workbook, sheet, startRow, i);
-                        }
+//                        for (int i = startRow + 1; i < startRow + purchaseOrderLineList.size(); i++) {
+//                            ExcelUtil.copyRow(workbook, sheet, startRow, i);
+//                        }
                         for (PurchaseOrderLine currentOrderLine : purchaseOrderLineList) {
                             ExcelUtil.setCellValue(sheet, startRow, 1, currentOrderLine.getIndustry());
                             ExcelUtil.setCellValue(sheet, startRow, 2, currentOrderLine.getQuality());
@@ -219,7 +219,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                                 formulaComponent.setSub(currentOrderLine.getLengthTolNeg());
                                 formulaComponentList.add(formulaComponent);
                             }
-                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
                             }