Merge remote-tracking branch 'origin/dev' into dev

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -50,7 +50,7 @@
         cs.hot AS `hot`,
         cs.crt_time AS `crtTime`,
         cs.concat AS `concat`,
-        REPLACE(GROUP_CONCAT( DISTINCT ct.`name` ),',','|') AS `storeTypeName` 
+        REPLACE(GROUP_CONCAT( DISTINCT ct.`name` ),',','|') AS `storeTypeName`
         FROM campsite_shop cs
         LEFT JOIN campsite_shop_tag cst ON cs.id = cst.shop_id
         LEFT JOIN campsite_tag ct ON cst.tag_id = ct.id