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

# Conflicts:
#	xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java

@@ -23,7 +23,7 @@ public interface ActivityFeign {
 
     @ApiOperation("单个优惠卷信息")
     @RequestMapping(value = "/user/info/{no}", method = RequestMethod.GET)
-    public UserCouponVo info(@PathVariable String no);
+    public UserCouponVo info(@PathVariable(value = "no") String no);
 
     @ApiOperation("优惠卷使用")
     @RequestMapping(value = "/user/use", method = RequestMethod.POST)