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

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/GoodDataVO.java

@@ -39,4 +39,13 @@ public  class GoodDataVO{
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

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

@@ -168,4 +168,12 @@ public class CampsiteShopAdminDTO {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

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

@@ -79,5 +79,13 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -216,4 +216,16 @@ public class CampsiteShop implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @Column(name = "img_title")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @Column(name = "img_keyword")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @Column(name = "img_desc")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminVO.java

@@ -175,4 +175,13 @@ public class CampsiteShopAdminVO {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java

@@ -99,4 +99,16 @@ public class CampsiteShopPageVo implements Serializable {
 
     @ApiModelProperty("地址")
     private String address;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

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

@@ -33,6 +33,9 @@
         <result property="hot" column="hot"/>
         <result property="saleState" column="sale_state"/>
         <result property="alt" column="alt"/>
+        <result property="imgTitle" column="img_title"/>
+        <result property="imgKeyword" column="img_keyword"/>
+        <result property="imgDesc" column="img_desc"/>
     </resultMap>
 
     <!--根据类型查询全部-->
@@ -77,7 +80,7 @@
 
     <!--首页查询全部-->
     <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc`
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -85,7 +88,7 @@
     </select>
 
     <select id="findAll" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc`
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -94,7 +97,7 @@
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
         select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
-        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt` from `campsite_shop` where `id`=#{id}
+        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt`,cs.img_title as `imgTitle`,cs.img_keyword as `imgKeyword`,cs.img_desc as `imgDesc` from `campsite_shop` where `id`=#{id}
     </select>
 
     <!--根据查询条件分页查询-->

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java

@@ -115,4 +115,12 @@ public class TourGoodDTO {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -137,4 +137,16 @@ public class TourGood implements Serializable {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
+
+	@Column(name = "img_title")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@Column(name = "img_keyword")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@Column(name = "img_desc")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java

@@ -133,4 +133,12 @@ public class TourGoodDetailVo {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java

@@ -106,4 +106,13 @@ public class SummitActivitySaveDTO implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

@@ -244,4 +244,16 @@ public class SummitActivity implements Serializable {
     @ApiModelProperty("seo*html标签优化")
     private String alt;
 
+    @Column(name = "img_title")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @Column(name = "img_keyword")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @Column(name = "img_desc")
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
+
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

@@ -125,4 +125,13 @@ public class SummitActivityAdminVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

@@ -85,4 +85,13 @@ public class SummitActivityDetailVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java

@@ -61,4 +61,13 @@ public class SummitActivityVo implements Serializable {
 
     @ApiModelProperty("seo*html标签优化")
     private String alt;
+    @ApiModelProperty("seo*html标签优化")
+    private String imgTitle;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgKeyword;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String imgDesc;
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -169,4 +169,16 @@ public class VehicleModel implements Serializable {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
+
+	@Column(name = "img_title")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@Column(name = "img_keyword")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@Column(name = "img_desc")
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -56,4 +56,13 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty("seo*html标签优化")
 	private String alt;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String imgTitle;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgKeyword;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String imgDesc;
+
 }