Merge branch 'master-tiande' into dev-tiande

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

@@ -123,4 +123,12 @@ public class TourGoodDTO {
 
 	@ApiModelProperty("seo*html标签优化")
 	private String imgDesc;
+
+	@ApiModelProperty("公司id")
+	private Long corporationId;
+
+
+
+	@ApiModelProperty("门店id")
+	private Integer companyId;
 }