From 9e434807cce14afae1abecc765c4ffc51423066a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 九月 2021 12:07:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index b2102e1..aadeb0b 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -731,7 +731,7 @@
row.createCell(7).setCellValue("--");
}
row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
- row.createCell(9).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(9).setCellValue("1" + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
row.createCell(10).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
row.createCell(11).setCellValue(dataObj.getString("averagePrice"));
if (!StringUtil.isEmpty(dataObj.getString("stock")) && !StringUtil.isEmpty(dataObj.getString("averagePrice"))) {
--
Gitblit v1.8.0