Commit 919313d3 authored by ma's avatar ma

Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx

parents f89d785b 5c56d65c
...@@ -32,4 +32,6 @@ build/ ...@@ -32,4 +32,6 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
*-acc.yml *-acc.yml
\ No newline at end of file
logs
\ No newline at end of file
...@@ -132,7 +132,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme ...@@ -132,7 +132,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
queryWrapper.eq(Device::getSnBind, snBind).last("limit 1"); queryWrapper.eq(Device::getSnBind, snBind).last("limit 1");
Device device = deviceMapper.selectOne(queryWrapper); Device device = deviceMapper.selectOne(queryWrapper);
if (device != null) { if (device != null) {
return ResResult.success().record(device.getSn()); return ResResult.success().goRecord(device.getSn());
} else { } else {
return new ResResult(405, "未绑定"); return new ResResult(405, "未绑定");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment