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

app/service/data_service.py

@@ -178,7 +178,7 @@ class UserCustomerDataAdaptor:
             confirm_share_date = pd.to_datetime(row["confirm_share_date"])
 
             # 根据确认净值日查看是否含有累积净值的数据，如果没有按照前后差值推算当天累积净值
-            if pd.isnull(cnav_df.loc[confirm_share_date, cur_fund_id]):
+            if pd.isnull(p_nav_df.loc[confirm_share_date, cur_fund_id]):
                 last_nav_data = p_nav_df[p_nav_df.index < confirm_share_date][cur_fund_id].dropna().tail(1)
                 last_cnav_data = p_cnav_df[p_cnav_df.index < confirm_share_date][cur_fund_id].dropna().tail(1)
                 # 判断上个净值日和当前确认日之中是否存在分红日