Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserCollectBiz.java

@@ -55,6 +55,8 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
           TourGood tourGood=tourFeign.one(typeId);
           if(tourGood!=null){
               BeanUtils.copyProperties(collect,tourGood);
+              collect.setId(null);
+              collect.setStatus(0);
               insertSelective(collect);
           }
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -92,6 +92,6 @@ public interface TourFeign {
                                      @RequestParam(value = "limit",defaultValue = "4") Integer limit);
 
     //获取商品信息
-    @RequestMapping(value = "/app/unauth/one", method = RequestMethod.GET)
+    @RequestMapping(value = "/good/app/unauth/one", method = RequestMethod.GET)
     public TourGood one(@RequestParam(value = "goodId",defaultValue = "0") Integer goodId);
 }