From 16cd5600efc6f94ed617cb09e1a2dd579017ddef Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:02:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

---
 server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index bd42084..d8eb021 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -241,7 +241,7 @@
         queryDeviceExtDTO1.setRootDepartId(user.getRootDepartment().getId());
         List<DeviceExtListVO> list1= deviceExtService.getListByCondition(queryDeviceExtDTO1);*/
         if(list.size()>0){
-            return ApiResponse.failed("璁惧缂栫爜锛屼笉鍏佽娣诲姞");
+            return ApiResponse.failed("璁惧缂栫爜宸插瓨鍦紝涓嶅厑璁告坊鍔�");
         }
         device.setDeleted(Constants.ZERO);
         device.setCreateTime(new Date());

--
Gitblit v1.9.3