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

app/utils/fund_rank.py

-
-from sqlalchemy import create_engine
-
-
 # db = create_engine(
 #     'mysql+pymysql://tamp_fund:@imeng408@tamper.mysql.polardb.rds.aliyuncs.com:3306/tamp_fund?charset=utf8mb4',
 #     pool_size=50,
@@ -43,7 +39,7 @@ def get_nav(fund, start_date, rollback=False, invest_type='public'):
                   "WHERE ts_code='{}'".format(fund)
             cur = tamp_product_session.execute(sql)
             data = cur.fetchall()
-            df = pd.DataFrame(list(data), columns=['ts_code', 'end_date', 'adj_nav']).dropna(how='any')
+            df = pd.DataFrame(list(data), columns=['fund_id', 'end_date', 'adj_nav']).dropna(how='any')
             df.rename({'ts_code': 'fund_id'}, axis=1, inplace=True)
         else:
             sql = "SELECT fund_id, price_date, cumulative_nav FROM fund_nav " \