Merge branch '1.0' of https://codeup.aliyun.com/5ec7ea24405cdab50f3fd8f0/galaxis/manatee into 1.0

src/main/java/com/galaxis/manatee/task/ChuanyunFinancialScheduledTask.java

@@ -123,13 +123,13 @@ public class ChuanyunFinancialScheduledTask {
                             ChuanyunUserCompanyDO chuanyunUserCompany=userCompanyList.get(0);
                             chuanyunReimbursementDO.setReimburseUserCostCode(chuanyunUserCompany.getCostCode());
                         }
-                        ChuanyunCostDO chuanyunCostDO=chuanyunCostDao.findById(chuanyunReimbursementDO.getBeneficiaryCostId()).orElseThrow();
+//                        ChuanyunCostDO chuanyunCostDO=chuanyunCostDao.findById(chuanyunReimbursementDO.getBeneficiaryCostId()).orElseThrow();
                         chuanyunReimbursementDO.setBusinessDate(chuanyunReimbursementDO.getCreatedTime());
                         chuanyunReimbursementDO.setReimburseUserCompanyCode(chuanyunCompanyDO.getErpCode());
                         chuanyunReimbursementDO.setReimburseUserCode(chuanyunUserDO.getEmployeeNumber());
                         chuanyunReimbursementDO.setBeneficiaryBankCode(chuanyunCompanyDO.getBankCode());
                         chuanyunReimbursementDO.setBeneficiaryBankAccount(chuanyunCompanyDO.getBankAccount());
-                        chuanyunReimbursementDO.setBeneficiaryCostCode(chuanyunCostDO.getCostCode());
+//                        chuanyunReimbursementDO.setBeneficiaryCostCode(chuanyunCostDO.getCostCode());
                         chuanyunReimbursementDO.setCurrency("C001");
                         chuanyunReimbursementDO.setExchangeRate(new BigDecimal("1"));
                         chuanyunReimbursementDO.setSettlementMethod("101");
@@ -140,7 +140,7 @@ public class ChuanyunFinancialScheduledTask {
                             chuanyunReimbursementDetailDO.setReimburseSubjectName(chuanyunReimbursementSubjectDO.getSubjectName());
                             chuanyunReimbursementDetailDO.setReimburseUserCompanyCode(chuanyunCompanyDO.getErpCode());
                             chuanyunReimbursementDetailDO.setGroupProjectCode(chuanyunGroupProjectCode.toString());
-                            chuanyunReimbursementDetailDO.setReimburseUserCostCode(chuanyunCostDO.getCostCode());
+//                            chuanyunReimbursementDetailDO.setReimburseUserCostCode(chuanyunCostDO.getCostCode());
                         });
                     }catch (Exception e){
                         log.warn(e.getMessage());