Merge branch 'liuzj-permission-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -81,12 +81,14 @@ class PromotionController extends CatchController
     }
 
     public function updateSeriesSequence(Request $request) {
-        $this->validate($request, ['id' => 'required', 'series_sequence' => 'required']);
+        $this->validate($request, ['id' => 'required',
+            'series_sequence' => 'required', 'remark' => 'nullable|string|max:140']);
 
         DB::table('promotions')
             ->where(['id' => $request->input('id'), 'uid' => $this->getLoginUserId(), 'is_enabled' => 1])
-            ->update(['series_sequence' => $request->input('series_sequence')
-                , 'updated_at' => date('Y-m-d H:i:s')]);
+            ->update(['series_sequence' => $request->input('series_sequence'),
+                'remark' => $request->input('remark', ''),
+                'updated_at' => date('Y-m-d H:i:s')]);
 
         return 'ok';
     }