From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
index f59b604..b9211bf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
@@ -56,9 +56,14 @@
BigDecimal lat = new BigDecimal(baSettingsMapper.getItemValue("lat"));
BigDecimal lng = new BigDecimal(baSettingsMapper.getItemValue("lng"));
+ Integer zoomMp = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomMp")).orElse("0"));
+ Integer zoomPc = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomPc")).orElse("0"));
+
VoMapCenter po = new VoMapCenter();
po.setLat(lat);
po.setLng(lng);
+ po.setZoomMp(zoomMp);
+ po.setZoomPc(zoomPc);
return po;
}
}
--
Gitblit v1.8.0