Merge branch 'develop'

app/Models/CmsContentTemplate.php

@@ -13,7 +13,7 @@ class CmsContentTemplate extends BaseModel
      * 可被批量赋值的字段
      * @var array
      */
-    protected $fillable = ['city_id','city_name','title','apply_type','is_open'];
+    protected $fillable = ['city_id','city_name','title','apply_type','is_open','status'];
 
     //一对多关联模板内容表
     public function cmsContentTemplateSet()

app/Models/CmsContentTemplateSet.php

@@ -15,7 +15,7 @@ class CmsContentTemplateSet extends BaseModel
      * 可被批量赋值的字段
      * @var array
      */
-    protected $fillable = ['rule','tpl_id','area_type'];
+    protected $fillable = ['rule','tpl_id','area_type','status'];
 
     //一对多关联模板内容表
     public function cmsContentTemplate()

app/Models/CmsSubject.php

@@ -15,7 +15,7 @@ class CmsSubject extends BaseModel
      * 可被批量赋值的字段
      * @var array
      */
-    protected $fillable = ['city_id','city_name','title','show_type','is_open'];
+    protected $fillable = ['city_id','city_name','title','show_type','is_open','used_count'];
 
     //一对多关联专题商品表
     public function cmsSubjectProduct()

app/Repositories/CmsContentTemplateRepository.php

@@ -57,7 +57,6 @@ class CmsContentTemplateRepository {
             'status' => 1,
             'is_open' => 0,
         ];
-        Log::debug('request-param-createTemplate:'.json_encode($subject));
 
         if ($request['city_id'] == 610100){
             $subject['is_open'] = 1;

app/Repositories/CmsSubjectRepository.php

@@ -54,8 +54,6 @@ class CmsSubjectRepository {
             'is_open' => $request['is_open'],
             'used_count' => 0
         ];
-        Log::debug('request-param-createSubject:'.json_encode($subject));
-
         $date = date('Y-m-d H:i:s');
 
         DB::beginTransaction();