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

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

@@ -71,6 +71,11 @@ public class TourGood implements Serializable {
 	@ApiModelProperty(value = "行程介绍")
     private String introduce;
 
+	//费用说明
+	@Column(name = "explain")
+	@ApiModelProperty(value = "费用说明")
+	private String explain;
+	
 	    //排序
     @Column(name = "rank")
 	@ApiModelProperty(value = "排序")

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java

@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.tour.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.tour.mapper")
 public class TourApplication {

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/config/WebConfiguration.java

-package com.xxfc.platform.app.config;
+package com.xxfc.platform.tour.config;
 
 import com.github.wxiaoqi.security.auth.client.interceptor.ServiceAuthRestInterceptor;
 import com.github.wxiaoqi.security.auth.client.interceptor.UserAuthRestInterceptor;