Merge branch 'dev' into 'mp-server-test'

经销商订单取消权限

See merge request quanshu/mp-server!454

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelOrderMgrController.java

@@ -112,7 +112,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 
 
   @PostMapping("/order/cancel")
-  @PreAuthorize("@ss.hasPermi('order:channel:edit')")
+  @PreAuthorize("@ss.hasPermi('order:channel:ship')")
   @ApiOperation("经销商订单取消")
   public AjaxResult cancelOrder(@Validated @RequestBody ChannelOrderCancelParam param) {
 	  return AjaxResult.success(channelOrderService.cancelOrderByAdmin(param));