Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

.gitignore

@@ -38,7 +38,9 @@ phpunit.phar
 # /frontend/web/index.php
 /frontend/web/index-test.php
 /frontend/web/robots.txt
-/backend/web/swagger-yaml/v1/swagger.yaml
 # /backend/web/index.php
 /backend/web/index-test.php
 /backend/web/robots.txt
+
+#swagger
+/backend/web/swagger-yaml/v1/swagger.yaml

backend/models/v1/shop/user/ShopUserMembergrade.php

@@ -3,7 +3,7 @@
 namespace app\models\v1\shop\user;
 
 use Yii;
-use yii\db\ActiveRecord;
+use app\models\v1\BaseModel;
 
 /**
  * This is the model class for table "shop_user_membergrade".
@@ -18,7 +18,7 @@ use yii\db\ActiveRecord;
  * @property string $MONEY_POINT_SRATE 购物获得积分比率
  * @property int $IS_SETRANGE 0:全店通用  1：指定商品 2.指定促销分类
  */
-class ShopUserMembergrade extends ActiveRecord
+class ShopUserMembergrade extends BaseModel
 {
     /**
      * {@inheritdoc}