Merge branch 'develop'

app/Repositories/CmsSubjectRepository.php

@@ -110,13 +110,15 @@ class CmsSubjectRepository {
     public function edit($request)
     {
         $subject = $this->cmsSubject->find($request['id']);
-
+        if ($subject->used_count != 0){
+            $request['is_open'] = 1;
+        }
         $subject->title = $request['title'];
         $subject->city_id = isset($request['city_id']) ? $request['city_id'] : 0;
         $subject->city_name = isset($request['city_name']) ? $request['city_name'] : '';
         $subject->show_type = $request['show_type'];
         $subject->is_open = $request['is_open'];
-        $subject->used_count = 0;
+        //$subject->used_count = 0;
         $subject->used_mall = isset($request['used_mall']) ? $request['used_mall'] : 1;
         $subject->subject_img = isset($request['subject_img']) ? $request['subject_img'] : '';