Merge branch 'liuzj-permission-dev' into test

modules/Callback/Http/Controllers/JuliangAccountController.php

@@ -33,7 +33,7 @@ class JuliangAccountController extends CatchController
         $this->validate($request, [
             'account_id' => 'required',
             'account_name' => 'required|string|max:64',
-            'callback_state' => 'required|integer|in:0,1',
+            'state' => 'required|integer|in:0,1',
             'protect_num' => 'required|integer|min:0',
             'default_rate' => 'required|min:0|max:100',
             'rate_time_config' => 'nullable|array',