Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

vnpy/trader/app/ctaStrategy/ctaBacktesting.py

@@ -892,6 +892,9 @@ class BacktestingEngine(object):
         self.tradeCount = 0
         self.tradeDict.clear()
         
+        # 清空逐日统计相关
+        self.dailyResultDict.clear()
+        
     #----------------------------------------------------------------------
     def runOptimization(self, strategyClass, optimizationSetting):
         """优化参数"""

vnpy/trader/gateway/bitmexGateway/bitmexGateway.py

@@ -528,7 +528,7 @@ class WebsocketApi(BitmexWebsocketApi):
         contract.name = contract.vtSymbol
         contract.productClass = PRODUCT_FUTURES
         contract.priceTick = d['tickSize']
-        contract.size = d['multiplier']
+        contract.size = d['lotSize']
         
         self.gateway.onContract(contract)