Merge branch 'master-seo-fix-feature' into base-modify

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-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