Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -72,6 +72,11 @@ public class TourGoodDTO {
 	@ApiModelProperty(value = "状态:0-未发布;1-上架；2-下架")
     private Integer status;
 
+	//是否省外；0-省内；1-省外
+	@ApiModelProperty(value = "是否省外；0-省内；1-省外")
+	private Integer isOutside;
+
+
 	//是否推荐:0-未推荐；1-已推荐
 	@ApiModelProperty(value = "是否推荐:0-未推荐；1-已推荐")
     private Integer recommend;

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

@@ -90,7 +90,12 @@ public class TourGood implements Serializable {
     @Column(name = "status")
 	@ApiModelProperty(value = "状态:0-未发布;1-上架；2-下架")
     private Integer status;
-	
+
+	//是否省外；0-省内；1-省外
+	@Column(name = "is_outside")
+	@ApiModelProperty(value = "是否省外；0-省内；1-省外")
+	private Integer isOutside;
+
 	    //创建时间
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )

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

@@ -83,6 +83,10 @@ public class TourGoodDetailVo {
 	//更新时间
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
+
+	//是否省外；0-省内；1-省外
+	@ApiModelProperty(value = "是否省外；0-省内；1-省外")
+	private Integer isOutside;
 	
 	//是否推荐:0-未推荐；1-已推荐
 	@ApiModelProperty(value = "是否推荐:0-未推荐；1-已推荐")

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

@@ -2,11 +2,6 @@ package com.xxfc.platform.tour.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -74,6 +69,10 @@ public class TourGoodVo implements Serializable {
 	@ApiModelProperty(value = "状态:0-未发布;1-上架；2-下架")
     private Integer status;
 
+	//是否省外；0-省内；1-省外
+	@ApiModelProperty(value = "是否省外；0-省内；1-省外")
+	private Integer isOutside;
+
 	//天数
 	@ApiModelProperty(value = "天数")
 	private Integer number;

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -24,6 +24,7 @@
         <result property="isMember" column="is_member"/>
         <result property="stock" column="stock"/>
         <result property="unit" column="unit"/>
+        <result property="isOutside" column="is_outside"/>
     </resultMap>
 
     <resultMap type="com.xxfc.platform.tour.vo.TourGoodVo" id="tourGoodVoMap">
@@ -47,6 +48,7 @@
         <result property="stock" column="stock"/>
         <result property="unit" column="unit"/>
         <result property="tagNames" column="tagNames"/>
+        <result property="isOutside" column="is_outside"/>
     </resultMap>
 
     <!--查询旅游路线列表-->