From f4ef9fccb3347fd364ca59575bf62fe5e4362f59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Jul 2021 14:17:09 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
index c84bad1..c9513c7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
+++ b/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);
--
Gitblit v1.9.1