Merge branch 'dev' of https://guangdagit.com/beike/beikeshop into dev

.env.example

@@ -3,7 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
-APP_TIMEZONE=RPC
+APP_TIMEZONE=PRC
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

beike/Admin/Http/Requests/CustomerGroupRequest.php

@@ -33,7 +33,7 @@ class CustomerGroupRequest extends FormRequest
     public function rules()
     {
         return [
-            'descriptions.*.name' => 'required|max:64',
+            'name.*' => 'required|max:64',
             'level' => 'required|max:16',
         ];
     }

beike/Admin/Services/CustomerGroupService.php

@@ -60,10 +60,10 @@ class CustomerGroupService
     {
         $descriptions = [];
         foreach ($data['name'] as $locale => $value) {
-            $descriptions[$locale]['name'] = $value;
-        }
-        foreach ($data['description'] as $locale => $value) {
-            $descriptions[$locale]['description'] = $value;
+            $descriptions[$locale] = [
+                'name' => $value,
+                'description' => $data['description'][$locale] ?? ''
+            ];
         }
 
         $params = [