From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 2c5e931..36e4685 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -476,7 +476,7 @@
map.put("time",join);
dailyVo.setCode(map);
dailyVo.setName(areaByCode.getAreaName());
- dailyVo.setType(tbDaily.getType().equals("car")?"���������":"���������");
+ dailyVo.setType(tbDaily.getType().equals("car")?"������":"���������");
dailyVos.add(dailyVo);
}
return dailyVos;
--
Gitblit v1.8.0