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

This reverts commit 9783f6cbb0.

src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java

@@ -74,7 +74,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
                 "yem_basefobamt * yem_baserate yem_cnyfobamt");
         dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
                 //人民币离岸价与开票额差额
-                "yem_cnyfobamt - yem_cnyinvoiced yem_fobsubinvoiced");
+                "ROUND(yem_cnyfobamt - yem_cnyinvoiced, 2) yem_fobsubinvoiced");
         dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
                 //美元离岸价
                 "CASE WHEN yem_usdrate > 0 THEN yem_cnyfobamt / yem_usdrate ELSE 0.0 END yem_usdfobamt");