Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -427,8 +427,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             confirmAlamVo.setUnitInvolvedId(equipmentSpecific.getAgencyId());
             confirmAlamVo.setUnitInvolvedName(unitMap.getString("bizOrgName"));
             confirmAlamVo.setAddress(address == null ? jsonObject.getString("companyLocation"):address);
-            confirmAlamVo.setLongitude(latitude == null?jsonObject.getDouble("longitude"): Double.valueOf(latitude));
-            confirmAlamVo.setLatitude(longitude == null?jsonObject.getDouble("latitude"):Double.valueOf(longitude));
+            confirmAlamVo.setLongitude(longitude== null?jsonObject.getDouble("longitude"): Double.valueOf(longitude));
+            confirmAlamVo.setLatitude(latitude == null?jsonObject.getDouble("latitude"):Double.valueOf(latitude));
         }
         try {
             // 机场人员