From 3e8437ae559487362fae3525beb79c534c213a51 Mon Sep 17 00:00:00 2001
From: 单军华
Date: Thu, 12 Jul 2018 13:44:34 +0800
Subject: [PATCH] bug修复和功能优化

---
 screendisplay/screendisplay/Classes/检测/Model/DeviceModel.h |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)

diff --git "a/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Model/DeviceModel.h" "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Model/DeviceModel.h"
new file mode 100644
index 0000000..d9b30bf
--- /dev/null
+++ "b/screendisplay/screendisplay/Classes/\346\243\200\346\265\213/Model/DeviceModel.h"
@@ -0,0 +1,55 @@
+//
+//  DeviceModel.h
+//  screendisplay
+//
+//  Created by ��������� on 2018/7/9.
+//  Copyright �� 2018��� ���������. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface DeviceModel : NSObject
+
+@property(nonatomic, strong) NSString * id;
+@property(nonatomic, strong) NSString * name;
+@property(nonatomic, strong) NSString * address;
+@property(nonatomic, strong) NSString * longitude; //������
+@property(nonatomic, strong) NSString * latitude; //������
+@property(nonatomic, strong) NSString * mac;
+@property(nonatomic, strong) NSString * operateUserId;
+@property(nonatomic, strong) NSString * state;// 0 ������ 1 ������������ 2 ������������ 3 ������������ 4 ������
+@property(nonatomic, strong) NSString * createTime;
+@property(nonatomic, strong) NSString * deviceVersionId;
+@property(nonatomic, strong) NSString * monitorPointId;
+@property(nonatomic, strong) NSString * installTime;
+@property(nonatomic, strong) NSString * isDelete;
+@property(nonatomic, strong) NSString * professionId;
+@property(nonatomic, strong) NSString * operateUser;
+@property(nonatomic, strong) NSString * deviceVersion;
+@property(nonatomic, strong) NSString * monitorPoint;
+@property(nonatomic, strong) NSString * organizationIds;
+@property(nonatomic, strong) NSString * profession;
+@property(nonatomic, strong) NSString * device_name;
+//"id": 2,
+//"name": "���������������2������(5890)",
+//"address": "���������������������������Y309(���������)",
+//"longitude": 120.988264,
+//"latitude": 31.43073,
+//"mac": "898602b8191630065890",
+//"operateUserId": 5,
+//"state": "4",
+//"createTime": 1511854799000,
+//"installTime": null,
+//"monitorPointId": 4,
+//"deviceVersionId": 1,
+//"isDelete": "0",
+//"professionId": 1,
+//"operateUser": null,
+//"deviceVersion": null,
+//"monitorPoint": null,
+//"organizationIds": null,
+//"profession": null,
+//"device_name": "���������������2������(5890)"
+
+    
+@end

--
Gitblit v1.8.0