Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -96,7 +96,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         List<ProductService> psList = productServiceFacade.list(qwps);
         if (psList.size() > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "该服务端正在使用，不允许删除，请先删除关联产品");
+                    "无法删除该服务端，请先删除该服务端令牌");
         }
         serviceInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
         this.updateById(serviceInfo);