From ad8d33ecf695a358ce8c1e69fc0d0f160e59b647 Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Thu, 1 Jan 2026 22:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E6=97=A5=E8=AF=AD=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E3=80=90=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E3=80=91=E4=B8=BA=E3=80=90=E3=83=97=E3=83=AD=E3=83=91=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/language/msg/msg_jp.yml | 2 +- .../resources/template/jp/deviceInfo_jp.xlsx | Bin 11249 -> 11265 bytes .../deviceinfo/DeviceInfoExcelJp.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml index 0317610..66d326b 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml @@ -31,7 +31,7 @@ msgjp: spaceNotFound: 該当空間がない faNotSameCompany: 空間と同じ会社に所属してください bindedDevice: 登録されたデバイスは存在しています - deviceTypeNotExist: デバイスタイプがない + deviceTypeNotExist: プロパティがない excelBuildingLineDuplicate: テーブルに同じデータがある dbBuildingDuplicate: プラットフォームにすでに該当ビルがない dbFloorDuplicate: プラットフォームには既にこのフロアが存在しています。 diff --git a/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx b/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx index edeedaa41a948f00d91063adf5de2282af1d6546..19b455a87ca5fd9cc41e9e206bbc7c499bc9ac89 100644 GIT binary patch delta 2801 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