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

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -512,7 +512,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                         commissionExpected.setReconciliationCompanyCode(reconciliationCompanyCode);
                         commissionExpected.setReconciliationCompanyBizId(reconciliationCompanyBizId);
                         commissionExpected.setCommissionPeriod(Convert.toInt(item.getIssueNumber()));
-                        commissionExpected.setTotalPeriod(Convert.toInt(item.getEndPeriod()));
+                        commissionExpected.setTotalPeriod(maxEndPeriod);
                         commissionExpected.setCommissionName(GetDictItemListByDictTypeResponse.getItemLabel(dictTypeResponses,
                                 "csf_commission_type", item.getExpenseName()));
                         commissionExpected.setCommissionType(item.getExpenseName());

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -467,6 +467,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
             Policy policy = new Policy();
             BeanUtils.copyProperties(policyFollow, policy, "id");
             policy.setPaymentPremium(policyFollow.getInitialPremium());
+            policy.setCurrency(policyFollow.getPolicyCurrency());
 
             if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
                 // 获取保单产品信息，填充对账公司相关字段