Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

.gitignore

@@ -19,5 +19,5 @@ Desktop.ini
 
 #App
 common/config/config.php
-
+vender
 frontendApi/web/pdfs/

frontendApi/modules/v1/controllers/ShopController.php

@@ -273,7 +273,7 @@ class ShopController extends BaseController {
      */
     public function actionOrderList() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
+        $condition = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
         $params[':USER_ID'] = \Yii::$app->user->id;
         $data = Order::lists($condition, $params, [
             'select' => 'O.*,U.REAL_NAME,OG.*,SG.CATEGORY_TYPE',