Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceService.java

@@ -179,11 +179,11 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
        deviceDO.setSimNo(sim);
        iotDeviceDao.save(deviceDO);
        //修改SIM卡管理列表
        IotDeviceSimDO simDO = iotDeviceSimDao.findBySim(sim);
        simDO.setDeviceSn(deviceDO.getDeviceSn());
        simDO.setDeviceName(deviceDO.getName());
        simDO.setDel("0");
        iotDeviceSimDao.save(simDO);
//        IotDeviceSimDO simDO = iotDeviceSimDao.findBySim(sim);
//        simDO.setDeviceSn(deviceDO.getDeviceSn());
//        simDO.setDeviceName(deviceDO.getName());
//        simDO.setDel("0");
//        iotDeviceSimDao.save(simDO);
        return Envelop.getSuccess("修改成功");
    }