合并dev-houpn开发代码到dev

hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/OrderController.java

@@ -122,7 +122,7 @@ public class OrderController {
      */
     @RequestMapping(value = "/rush/order/{orderId}", method = RequestMethod.POST)
     @ApiOperation(value = "抢单接口", notes = "需要通过下单编号获取订单信息后进行绑定")
-    @ClearAndReloadCache(name = ORDER)
+    //@ClearAndReloadCache(name = ORDER)
     public Result rush(OrderXd u) {
 
         orderService.update(u);
@@ -138,7 +138,7 @@ public class OrderController {
      */
     @RequestMapping(value = "/unbind/order/{orderId}", method = RequestMethod.POST)
     @ApiOperation(value = "解绑订单接口", notes = "需要通过下单编号获取订单信息后进行解绑")
-    @ClearAndReloadCache(name = ORDER)
+    //@ClearAndReloadCache(name = ORDER)
     public Result revoke(OrderXd u,
                          @ApiParam("订单唯一id标识") @PathVariable String orderId) {