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

@@ -153,7 +153,7 @@ class CustomTemplateController extends BaseController
         $this->request->validate([
             'id'=>['required'],
         ],[
-            'id.required' => '模版ID不能为空',
+            'id.required' => 'ID不能为空',
         ]);
         $logic->saveRollbackVersion();
         $this->response('success');