查询设备名称和型号

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/device/DeviceManageEndpoint.java

@@ -375,11 +375,11 @@ public class DeviceManageEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("findDmDeviceDict")
    @GetMapping("findDmDeviceDictName")
    @ApiOperation("查询设备名称以及型号")
    public ObjEnvelop findDmDeviceDict(){
    public ObjEnvelop findDmDeviceDictName(){
            return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDict()) ;
            return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDictName()) ;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DeviceManageService.java

@@ -33,7 +33,7 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
    @Autowired
    private DeviceDao deviceDao;
    public JSONObject findDmDeviceDict() {
    public JSONObject findDmDeviceDictName() {
        String deviceNameSql = "select deviceName from wlyy_devices";
        String deviceModelSql = "select deviceModel from wlyy_devices";