Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/stock_new into dev

application/market/model/Position.php

@@ -336,7 +336,7 @@ class Position extends Model{
      */
     public function add_m_position($stockinfo,$count,$sub_id,$lid,$user,$soure,$ck_price,$model,$Trust_no = 0){
 
-        $position_res = self::getCodePosition($sub_id, $stockinfo["code"]);
+        $position_res = self::getCodePosition($sub_id, $stockinfo["code"],toMarket($stockinfo["code"]));
         if(empty($position_res)){
             if($model==2){
                 $data=array();