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

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

@@ -23,7 +23,12 @@ public class TourGoodBanner implements Serializable {
     @Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("首页banner图主键")
-    private Long id;
+    private Integer id;
+
+	//商品id
+	@Column(name = "good_id")
+	@ApiModelProperty("商品id")
+	private Integer goodId;
 	
 	    //标题
     @Column(name = "title")

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

@@ -52,9 +52,9 @@ public class TourGoodSpePrice implements Serializable {
     private BigDecimal price;
 	
 	    //儿童价格
-    @Column(name = "chid_price")
+    @Column(name = "child_price")
 	@ApiModelProperty(value = "儿童价格")
-    private BigDecimal chidPrice;
+    private BigDecimal childPrice;
 	
 	    //会员价格
     @Column(name = "member_price")

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

@@ -24,8 +24,14 @@ public class TourTagBanner implements Serializable {
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("首页banner图主键")
     private Long id;
-	
-	    //标题
+
+	//标签id
+	@Column(name = "tag_id")
+	@ApiModelProperty(value = "标签id")
+	private Integer tagId;
+
+
+	//标题
     @Column(name = "title")
 	@ApiModelProperty(value = "标题")
     private String title;