Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -340,7 +340,7 @@ class CmsContentTemplateSetRepository
         $pro_array = $product->toArray();
         $res_id = implode(",", array_column($pro_array, 'product_id'));
 
-        $field_order = $request['field_order'];
+        $field_order = $request['field_order'] ?? '';
         $product_key = config('constants.CMS_PRODUCTS');
         if (isset($field_order)) {
             $product_keys = sprintf($product_key, md5($res_id . $field_order));