Bladeren bron

Merge branch 'master' of http://chenzheshi.myds.me:3000/Daniel/stock

Daniel 1 jaar geleden
bovenliggende
commit
fd8a3f4b91
1 gewijzigde bestanden met toevoegingen van 4 en 0 verwijderingen
  1. 4 0
      get_history_futures.py

+ 4 - 0
get_history_futures.py

@@ -14,7 +14,11 @@ print(type(stock_pool),stock_pool)
 print(item for item in stock_pool)
 print(item for item in stock_pool)
 # 22
 # 22
 # 11
 # 11
+<<<<<<< HEAD
 # 1234
 # 1234
+=======
+# 33
+>>>>>>> a095f4969109e4e802a0c7a69b2a548d22688ca6
 
 
 
 
 # futures = ['IF9999.CCFX', 'IC9999.CCFX','IH9999.CCFX', 'IM9999.CCFX', 'FU9999.XSGE', 'RB9999.XSGE', 'MA9999.XZCE', 'TA9999.XZCE', 'SA9999.XZCE', 'M9999.XDCE', 'LH9999.XDCE']
 # futures = ['IF9999.CCFX', 'IC9999.CCFX','IH9999.CCFX', 'IM9999.CCFX', 'FU9999.XSGE', 'RB9999.XSGE', 'MA9999.XZCE', 'TA9999.XZCE', 'SA9999.XZCE', 'M9999.XDCE', 'LH9999.XDCE']