Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/IotMachineServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -407,6 +408,8 @@ public class IotMachineServiceImpl implements IotMachineService {
                     iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
                     iotLocationVo.setEndTime(jsonObject.getString("endtime"));
                     iotLocationVo.setAddress(jsonObject.getString("address"));
+                    iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat")));
+                    iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon")));
                     iotLocationVoList.add(iotLocationVo);
                 }
             }