Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -315,6 +315,7 @@ class CmsContentTemplateSetRepository
             Log::debug('兑换商城缓存存储成功-' . json_encode($group_array));
         }
 
+        $group_array['is_show'] = intval(config('customer.exchange_shop_is_show'));
         return $group_array;
     }
 

config/customer.tpl

@@ -6,4 +6,5 @@ return [
     'app_service_url' => '{app_service_url}',
     'cms_subject_one_bgimg' => '{cms_subject_one_bgimg}',
     'cms_subject_two_bgimg' => '{cms_subject_two_bgimg}',
+    'exchange_shop_is_show' => '{exchange_shop_is_show}',
 ];