Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-22 f4ef9fccb3347fd364ca59575bf62fe5e4362f59

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java

@@ -96,7 +96,7 @@
        }
        Integer status = jhyOrder.getStatus();
        if(JhyOrder.ORDER_STATUS_WAITING != status){
            return JsonResult.failMessage("订单不是待接单状态，不允许取消！");
            return JsonResult.failMessage("订单不是待接单状态，不允许指派！");
        }
        long jhyId = model.getJhyId();
        JhyInfo jhyInfo = jhyOrderMapper.selectJhyInfoByUserId(jhyId);