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

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -36,8 +36,8 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     @ApiOperation("我的优惠卷")
     @RequestMapping(value = "/coupon/list", method = RequestMethod.GET)
     public ObjectRestResponse list(@RequestParam(value = "type",defaultValue = "0") Integer type,
-                                   @RequestParam(value = "channel") Integer channel,
-                                       @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
+                                   @RequestParam(value = "channel",required = false) Integer channel,
+                                   @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
         AppUserDTO userInfo = getUserInfo();
         Integer userId = userInfo.getUserid();
         if(userId==null){