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

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopPageDTO.java

@@ -101,6 +101,18 @@ public class CampsiteShopPageDTO implements Serializable {
     @ApiModelProperty("联系人")
     private String concat;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

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

@@ -54,6 +54,10 @@
         cs.hot AS `hot`,
         cs.crt_time AS `crtTime`,
         cs.concat AS `concat`,
+        cs.alt AS `alt`,
+        cs.img_title AS `imgTitle`,
+        cs.img_keyword AS `imgKeyword`,
+        cs.img_desc AS `imgDesc`,
         REPLACE(GROUP_CONCAT( DISTINCT ct.`name` ),',','|') AS `storeTypeName`
         FROM campsite_shop cs
         LEFT JOIN campsite_shop_tag cst ON cs.id = cst.shop_id

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.uccn.mapper.ArticleMapper">
 
     <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
-        select id, title,epitome,add_time,cover_image,`alt` from article
+        select id, title,epitome,add_time,cover_image,`alt`,`tag_title` as `tagTitle`,`keywords`,`description` from article
         where
         is_del=0
         and status=1