Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java

@@ -65,8 +65,10 @@ public class ScmVehRebateExcelVo {
     private String calculationStandard;
     @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
     private String estimateRebate;
-    @ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost")
-    private String expectCost;
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
+    private String expectTreatCost;
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
+    private String expectSuppCost;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
     @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -110,8 +110,6 @@
         *,
         @row_number := @row_number + 1 AS rankNo,
         sid AS vehRebateSid,
-        expectTreatCost + expectSuppCost AS expectCost,
-        expectTreatCost + expectSuppCost AS withholdCost,
         onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
         FROM
         scm_veh_rebate,(