Merge remote-tracking branch 'origin/master'

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

@@ -627,6 +627,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 scmVehRebate.setCalculationStandard(info.getCalculationStandard());
                 scmVehRebate.setEstimateRebate(info.getEstimateRebate());
                 scmVehRebate.setPalceGenDate(info.getPalceGenDate());
+                scmVehRebate.setExpectTreatCost(new BigDecimal(info.getExpectTreatCost()));
+                scmVehRebate.setExpectSuppCost(new BigDecimal(info.getExpectSuppCost()));
+                scmVehRebate.setExpectSuppRemark(info.getExpectSuppRemark());
+                scmVehRebate.setRemarks(info.getRemarks());
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
                 scmVehRebate.setCreateOrgSid(useOrgSid);