Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -70,7 +70,7 @@ class WebSettingLogic extends BaseLogic
 //            return $this->success($list);
 //        }
         $field = $type == UpdateNotify::TYPE_MINOR ? 'minor_languages_status' : 'status';
-        $updateNotifyModel->edit(['status'=>1],['project_id' => $this->user['project_id'], $field => 0]);
+        $updateNotifyModel->edit([$field => 1], ['project_id' => $this->user['project_id'], $field => 0]);
         $param = [
             'project_id' => $this->user['project_id'],
             'type' => $type,