app1第一次迭代功能实现

2f042fbc08 第四周周计划及第三周会议纪要

2e0aacbdac Merge pull request '第四周周计划' (#1 ) from junmao_branch into develop

e2f32dd02c 个人周计划4

8ea1150825 罗月航的第四周周计划

f81fa50d4c Merge pull request '罗月航第一次周计划提交' (#2 ) from luoyuehang_branch into develop

1e461b445e 张红卫第四周计划

3d300c225c Merge pull request '张红卫' (#3 ) from zhanghongwei_branch into develop

09ad03df41 王磊的第四周个人周计划

117b3d0c08 Merge pull request '王磊的第四周个人周计划' (#4 ) from wanglei_branch into develop

ab5bd5bc49 周竞由的第四周周计划

6c5ecfe8e0 周竞由的第四周周计划

fdcb2bc360 Merge pull request '周竞由的第四周周计划' (#5 ) from jingyou_branch into develop

63380d7d37 数据传输部分草稿1

395f909308 Merge pull request 'mqtt草稿-未完全验证' (#6 ) from junmao_branch into develop

584e2aca62 张红卫第四周计划总结

8dce667d5c Merge pull request '张红卫第四周周总结' (#7 ) from zhanghongwei_branch into develop

fa98dacdb8 罗月航4周总结

25ef735af7 Merge pull request '罗月航第四周周总结' (#8 ) from luoyuehang_branch into develop

f71f2b4fac 王磊第四周完成的任务-系统现已实现从MQTT数据接收、智能解析、自动告警到MySQL数据库存储的完整数据处理流水线，支持多端数据分发和实时监控告警。

0153d79686 Merge pull request '王磊-第四周周总结' (#9 ) from wanglei_branch into develop

94c01ada4c 周竞由的第四周周总结

1ba72ffe5f 周竞由的第四周周总结

b9b34bea78 周竞由的第四周周总结

c60363da3c 周竞由的第四周周计划

71ec1eb8d0 Merge pull request '周竞由的第四周周总结' (#10 ) from jingyou_branch into develop

9c6ee82bce 第四周计划

b84e18652c 第四周计划

76bbdeec80 Merge pull request '第四周计划' (#11 ) from zhanghongwei_branch into develop

63ba3a7b1a 第四周计划

5dd873c41f Merge pull request '第四周计划' (#12 ) from zhanghongwei_branch into develop

1a08fb7e21 小组、曹峻茂第四周总结

f9e7d044df Merge remote-tracking branch 'origin/develop' into junmao_branch

f8956c6b95 Merge pull request '第四周周总结' (#13 ) from junmao_branch into develop

e2d4cf3fb2 张红卫周计划与第五章纪要

d44080486b Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

30afa3dc16 张红卫周计划与第五章纪要

c0fd829ae2 张红卫周计划与第五章纪要

3fe85e6ccb 张红卫第五周计划与第五章纪要

1317f865cb Merge remote-tracking branch 'origin/develop' into junmao_branch

b4d20d5691 罗月航第五周周计划

9e987e61a8 小组、曹峻茂第5周计划

855646a1b6 Merge remote-tracking branch 'origin/develop' into junmao_branch

a6274b960a 小组、曹峻茂第5周计划

efdf0ab337 小组、曹峻茂第5周计划

a64403b77c 王磊-第五周个人周计划

5179eab21c Merge pull request '王磊-第五周个人周计划' (#14 ) from wanglei_branch into develop

15596410b3 周竞由的第四周周计划

02c4f946c9 周竞由的第五周周计划

41e89a1752 用例文档第一稿

2261ac901d Merge remote-tracking branch 'origin/develop' into junmao_branch

8d1c9998c3 Revert "用例文档第一稿"

This reverts commit 41e89a1752.

4524836611 用例文档第一稿

f7d98e4fde Merge branch 'develop' into zhanghongwei_branch

97a9ef293e Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

f236229cae 罗月航第五周周总结

c7a08d3256 王磊-第五周个人周总结

6d54804269 Merge pull request '王磊第五周个人周总结' (#15 ) from wanglei_branch into develop

321eb2832f 曹峻茂第五周周总结

5874f6b5bd 罗月航第五周周总结

c391d5b560 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

a4f74b2565 罗月航第五周周总结

337d9264bc Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

5c718a78d0 小组第六周计划

c5b0bd1f6c 曹峻茂第六周计划

dc63705804 罗月航第六周周计划

19b378c9a4 第5周总结

48eaad0e38 Merge remote-tracking branch 'origin/develop' into junmao_branch

a975538914 第5周总结

56b3b541d2 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

c23f94f34c 王磊-第六周个人周计划

a227003f01 Merge pull request '王磊第六周个人周计划' (#16 ) from wanglei_branch into develop

6313fb7942 张红卫第五周周总结、第六周会议纪要与张红卫第五周周计划

69b75f401c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

b14aef01e2 张红卫第五周周总结、第六周会议纪要与张红卫第五周周计划

d30b3782e7 "张红卫第五周周总结、第六周会议纪要与张红卫第五周周计划"

ffabdbf459 周竞由的第五周周总结和第六周周计划

d15c8c5932 周竞由的第五周周总结和第六周周计划

37ce381de4 周竞由的第五周周总结和第六周周计划

3d9930a64e 周竞由的第五周周总结和第六周周计划

642d61e5d4 用例文档修改-拆分用水和水质查询

810f8b4316 Merge remote-tracking branch 'origin/develop' into junmao_branch

bdc1ebdb7d 用例文档修改-拆分用水和水质查询

d5cec1ff4a 用例规范化

7cc91713b4 王磊-第六周个人周总结

c178c39f39 Merge pull request '王磊第六周周总结' (#17 ) from wanglei_branch into develop

7dadc48fc3 曹峻茂第七周计划

d50318a9d7 小组第七周计划

2011021e03 小组第六周总结

417459365a 罗月航第六周周总结及第七周周计划

064994085a 第七周会议纪要、张红卫的第六周总结与第七周计划

d816e0c45e 王磊-第七周个人周计划

2357f1fab3 Merge pull request '王磊第七周个人周计划' (#18 ) from wanglei_branch into develop

0ce8b69404 周竞由的第六周周总结和第七周周计划

068d0bdba5 需求规格说明书，项目前景与范围文档

52086dbbd0 Merge remote-tracking branch 'origin/develop' into junmao_branch

f5e959bbb9 用例文档最终稿

8c598e76a8 第七周周总结

a360216297 第8周周计划

faa4e3ecf2 罗月航第七周周总结及第八周周计划

8d4539ca22 第八周会议纪要、张红卫的第七周总结与第八周计划

7ed791b711 王磊-第七周周总结和第八周周计划

d59be986de Merge pull request '王磊-第七周周总结和第八周周计划' (#19 ) from wanglei_branch into develop

b8d8e66470 周竞由的第七周周总结和第八周周计划

fe44f56448 周竞由的第七周周总结和第八周周计划

df8b3ac2f1 Merge remote-tracking branch 'origin/develop' into develop

7bba6022a1 第8周周计划

a058d8a790 迭代开发计划第一稿

4f72fe2dfe 王磊-第八周周计划修改

041e8baaac 数据库设计文档

aa6f7206be Merge pull request '数据库设计文档' (#20 ) from wanglei_branch into develop

0b3b2c297b 第六周总结

927fe1023c 第七周总结

bddd054b9b 第八周总结

3d3e231421 第九周计划

38760c73d8 曹峻茂第八周计划

dfa1a2096a 罗月航第八周周总结及第九周周计划

c7ddf5f937 第八周会议纪要、张红卫的第七周总结与第八周计划

7f54fcfade 第九周会议纪要、张红卫的第八周总结与第九周计划

dcd294f0db 第九周会议纪要、张红卫的第八周总结与第九周计划

0f94aec186 王磊-第八周个人周总结和第九周个人周计划

02d3873c2c Merge pull request '王磊-第八周个人周总结和第九周个人周计划' (#21 ) from wanglei_branch into develop

c9662d12af 周竞由的第八周周总结和第九周周计划

4fd52e1a6e 项目框架调整

db89ba2114 Merge remote-tracking branch 'origin/develop' into junmao_branch

a9698de3da 项目框架调整

cb7ddd2a83 迭代开发计划第二稿

8b67284559 Merge pull request '开发计划第二稿' (#22 ) from junmao_branch into develop

b938551126 王磊——数据库类和接口

a06c7b2d2f Merge pull request '王磊——数据库类和接口' (#23 ) from wanglei_branch into develop

4c24dc3cb0 修改代码框架

292a5332c0 Merge pull request '调整代码结构' (#24 ) from junmao_branch into develop

e0e4544576 迭代开发计划

ce5985292c Merge remote-tracking branch 'origin/develop' into junmao_branch

1f28ec6bde 周计划，总结

1a021dd39b 周总结

cbea9c6ead 删除草稿

e8f0d3bfb2 第十周计划

4ee5722490 第十周计划

879b55795c 迭代开发计划

90554df404 罗月航第九周周总结及第十周周计划

caaf2db365 application.yml

6e2c620fac Merge remote-tracking branch 'origin/develop' into wanglei_branch

# Conflicts:
#	src/main/resources/application.yml

60c52c9ec0 王磊——第九周周总结和第十周周计划

2508399a73 Merge pull request 'application.yml' (#25 ) from wanglei_branch into develop

f09dc3a85c 张红卫第十周会议纪要、周计划与第九周总结

ed15f502d2 周竞由的第9周周总结和第10周周计划

b75acd70ea 修改周总结位置

c23068e1ca 修改周总结位置

b62c4fd36d 王磊——第十周新增开发工单管理接口，开发扫码用水接口，水质信息查询接口

2cc26526c3 Merge pull request '王磊——第十周新增开发工单管理接口，开发扫码用水接口，水质信息查询接口' (#26 ) from wanglei_branch into develop

1895b8e13a 王磊——pom.xml

7e32ceeb54 Merge pull request 'pom.xml' (#27 ) from wanglei_branch into develop

c3f7b955a8 登录接口

b4e0b2471e 依赖添加

14e68de32f Merge pull request 'Integration依赖添加' (#28 ) from junmao_branch into develop

e8f6f5de02 删除过时文件

71410741b7 Merge pull request '删除过时文件' (#29 ) from junmao_branch into develop

0413e41240 王磊——代码注释

951f8306a8 Merge pull request '代码注释' (#30 ) from wanglei_branch into develop

47a0c184e7 Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/campus/water/mapper/AdminRepository.java
#	src/main/java/com/campus/water/mapper/RepairerAuthRepository.java
#	src/main/java/com/campus/water/mapper/UserRepository.java

ca86a994b1 登录接口1.1

344121d19a 登录接口1.1

3ac29039b9 修改mqtt变量

cb2335b435 Merge pull request '修改mqtt变量' (#32 ) from junmao_branch into develop

7e81089d15 登录接口1.2

99914981a2 Merge pull request '修复mapper和repository文件夹冲突' (#33 ) from jingyou_branch into develop

8aa64e4158 目录修正

555b45f525 Merge pull request '目录修正' (#34 ) from junmao_branch into develop

2542596efe mqtt服务器地址

3e8c5beb2f Merge pull request '服务器地址' (#35 ) from junmao_branch into develop

5ca86891aa 修正依赖版本

08e72ad2a7 Merge pull request '修正依赖版本' (#36 ) from junmao_branch into develop

fd9727b579 罗月航app1的登录页面

90a3f5aa81 登录

b494c575e7 Merge pull request 'app1的登录功能' (#37 ) from luoyuehang_branch into develop

c73d493efe 告警逻辑1.0

20be744f93 Merge pull request '告警逻辑1.0' (#38 ) from jingyou_branch into develop

413bd0dad1 登录

0958327fbb 罗月航app1的登录页面

f27797e1a5 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

87cbc2122a 罗月航app1的登录页面

5a05754daf Merge pull request '登录app1修改' (#39 ) from luoyuehang_branch into develop

6cdaa073e8 罗月航app1的登录页面

8e176552a1 Merge pull request 'app1登录修改' (#40 ) from luoyuehang_branch into develop

4d2e5f66c8 11周计划及10周总结

5123d1f0c5 周竞由第十周周总结和第十一周周计划

03fc9d219b Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

4a238a5cf8 罗月航第十周周总结及第十一周周计划

b6ca4eee31 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

f2830d939a 第十一周会议纪要、张红卫第十周总结和第十一周计划

4165b0044c 王磊——第十周周总结和第十一周周计划

1628e7a8ec Merge pull request '王磊——第十周周总结和第十一周周计划' (#41 ) from wanglei_branch into develop

85fe0bd79b 注册接口

ef92a10614 Merge pull request '注册接口' (#42 ) from jingyou_branch into develop

8d19836ea0 权限细化：实现接口级权限控制（学生仅访问个人用水 / 水质查询，维修人员仅访问辖区工单 / 设备，管理员全权限）；

告警功能完善：告警分级（一般 / 紧急）、告警推送（Web/APP 消息提醒）、告警历史查询接口；

9beee3cf72 Merge pull request '权限细化，告警功能完善' (#43 ) from jingyou_branch into develop

cc503b5ee7 王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）

4461d18845 王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）

bdd108c83c Merge remote-tracking branch 'origin/wanglei_branch' into wanglei_branch

6e1f9969f7 Merge pull request '王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）' (#44 ) from wanglei_branch into develop

7430e23bfe 活动图-顺序图-类图

81321df1d7 修改接口代码

10b6ad77b5 Merge pull request '接口代码修改' (#45 ) from wanglei_branch into develop

d66ad471bf 数据库连接配置修改

7083a21a0b Merge pull request '数据库连接配置' (#46 ) from junmao_branch into develop

51ca748038 数据库连接配置修改2

507c005d3e Merge pull request '数据库配置修改' (#47 ) from junmao_branch into develop

64347a81e3 修改映射冲突问题

3649b7e4f5 Merge pull request '修改映射冲突问题' (#48 ) from wanglei_branch into develop

82daeb53b3 修改问题

25930959a7 Merge pull request '修改问题' (#49 ) from wanglei_branch into develop

ec9536b85d 修改问题

0282eb43e3 Merge pull request '新增代码' (#50 ) from wanglei_branch into develop

7582d3a402 mqtt配置修改

9c6d8f8939 Merge pull request 'mqtt配置设置' (#51 ) from junmao_branch into develop

24fcebbf04 mqtt状态变量转为小写

ddcb23187b Merge pull request 'mqtt状态变量小写' (#52 ) from junmao_branch into develop

dabcaf4106 修改响应格式

0a422fd504 CORS 配置

e0c6b9e9b8 CORS 配置

05a12d7143 Merge pull request 'cors配置' (#53 ) from jingyou_branch into develop

2d9f32a1a8 CORS 配置2

68760f15a6 Merge remote-tracking branch 'origin/develop' into develop

4d3f8643ca 增加处理请求参数验证失败

cd3e019cd6 登录接口

e9268506bb 修正映射重复问题，修改加密方式

3e40c35b5d Merge pull request '修正映射重复问题，修改加密方式' (#54 ) from jingyou_branch into develop

62f5d3dcda 修正映射重复问题，修改加密方式

e1564ba205 罗月航app1的登录功能实现及所有页面

a2589e865e 罗月航app2的登录功能实现及所有页面

270198dd16 罗月航app1和2的注册功能实现

002e6ca05c 增加增删设备功能接口

52d4147e63 Merge pull request '增加增删设备功能接口' (#55 ) from wanglei_branch into develop

1a7f65f2e0 修改device相关代码

68c0bc120a Merge remote-tracking branch 'origin/develop' into wanglei_branch

c4370201e3 Merge pull request '修改device相关代码' (#56 ) from wanglei_branch into develop

7bdd023c96 Merge remote-tracking branch 'origin/zhanghongwei_branch' into zhanghongwei_branch

b5d4232bdc Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

1302e7688b 12周计划和11周总结

8320bf00f8 登录接口

37f03a61c3 罗月航app1的登录认证及权限控制

d187851afc Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

160ac542df 罗月航第十一周周总结及第十二周周计划

daad86bd6e app1文件漏传

cda7d36aa8 Merge pull request '登录接口' (#57 ) from zhanghongwei_branch into develop

988d76a125 Merge pull request 'app1文件漏传' (#58 ) from luoyuehang_branch into develop

83da67cd6d 第十二周会议纪要、张红卫第十一周总结与第十二周计划

ab0a174446 Merge remote-tracking branch 'origin/develop' into develop

c86a25a984 统一repairman角色类型

70eeba3e76 Merge pull request '统一repairman角色类型' (#59 ) from jingyou_branch into develop

ec1b3815af 增加加载管理员列表接口

92433814db 增加加载管理员列表接口和用户列表接口

f9679cf72f Merge pull request '增加加载管理员列表接口和用户列表接口' (#60 ) from jingyou_branch into develop

63a6e1d890 周竞由的第11周周总结和第12周周计划

177fd074bd Merge remote-tracking branch 'origin/develop' into develop

2cd0e67a5f Merge remote-tracking branch 'origin/develop' into wanglei_branch

04742f3612 修改admin相关代码

886fd076a6 Merge pull request '修改admin相关代码' (#61 ) from wanglei_branch into develop

420588ea2c 修改admin的role相关代码

28fbaf06e3 Merge pull request '修改admin的role相关代码' (#62 ) from wanglei_branch into develop

611b6415c9 token修改

1004d090d5 Merge pull request 'token修改' (#63 ) from jingyou_branch into develop

0eb812c19b 密钥修改

42be61220d Merge remote-tracking branch 'origin/develop' into develop

7ccb1664b0 修改admin的role相关代码

735bd8f091 Merge pull request '恢复admin相关代码' (#64 ) from wanglei_branch into develop

89d6c7d555 修改工单相关代码

397efacddb Merge pull request '修改工单相关代码' (#65 ) from wanglei_branch into develop

c6bd1971c1 token生成修改

dd68209794 admin权限细化

df7b60d571 Merge pull request 'admin权限细化' (#66 ) from jingyou_branch into develop

0b6f688b9a app1首页待处理工单展示功能

e91b5e56ac app1首页待处理工单展示功能漏传

1cb14e428a 修改登录相关代码

3324c72ffb Merge pull request '修改登录相关代码' (#67 ) from wanglei_branch into develop

103d72dae4 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

a248571108 Merge pull request 'app1首页展示个人待处理工单功能' (#68 ) from luoyuehang_branch into develop

c089d86286 jwt修复

43ec063d37 Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/campus/water/service/RegisterService.java

f0ba8d6cc4 jwt修复

83a3dd6042 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

59614aaaa5 jwt修复

e3663f4037 修改工单状态相关代码

b0e70c7e2d Merge pull request '修改工单状态相关代码' (#70 ) from wanglei_branch into develop

9d17c162f1 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

e97724337c app2登录认证与权限控制实现

202cdefaa9 Merge pull request 'app2登录认证与权限控制实现' (#71 ) from luoyuehang_branch into develop

2dd74d6fc9 增加制水机、供水机关联相关代码

db29aa7472 Merge pull request '增加制水机、供水机关联相关代码' (#72 ) from wanglei_branch into develop

6697cd7ab4 部分接口

0af7b62f2e app1工单抢单 / 拒单 / 提交功能

6462e81be8 管理员界面

5e41dff7df Merge pull request '管理员列表加载' (#73 ) from zhanghongwei_branch into develop

7280350b0c 修改维修工获取工单与区域对应关联相关代码

6258b77a14 Merge pull request '修改维修工获取工单与区域对应关联相关代码' (#74 ) from wanglei_branch into develop

914e7ecb9f Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

4fee4e7c0b app1工单抢单 / 拒单 / 提交功能更新

f3c64b0d50 Merge pull request 'app1工单抢单 / 拒单 / 提交功能更新' (#75 ) from luoyuehang_branch into develop

14108985ab 修改维修工、管理员获取工单功能相关代码

e331d7df19 Merge pull request '修改维修工、管理员获取工单功能相关代码' (#76 ) from wanglei_branch into develop

fc324adec9 repair人员注册功能修复

46e95f588c Merge pull request 'JWT修复' (#69 ) from jingyou_branch into develop

50ea83f0cf 待抢单工单列表加载

d31232dd7a repair人员注册功能修复

120367336d repair人员用户列表接口

5360925e3e Merge pull request 'repair人员用户列表接口' (#77 ) from jingyou_branch into develop

2d5b7be244 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

533e40f3d3 维修人员与用户列表

d82c83f3de app1注册功能完善

a388d9ef99 修改管理员获取工单相关代码

4bae2c5dc3 Merge pull request '修改管理员获取工单相关代码' (#78 ) from wanglei_branch into develop

e17f971830 修改维修工查看设备相关代码

848aaf6ed3 Merge pull request '修改维修工查看设备相关代码' (#79 ) from wanglei_branch into develop

4a33867c67 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

e201d78c5c app1注册功能完善

59fdf1a376 修改管理员相关代码

ff639aab44 Merge remote-tracking branch 'origin/develop' into wanglei_branch

639974afc2 Merge pull request '修改管理员相关代码' (#80 ) from wanglei_branch into develop

cd7b3a04bc Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

1af0fa86ce Merge remote-tracking branch 'origin/develop' into wanglei_branch

cd331e00e0 修改管理员相关代码

97d568b2f3 Merge pull request '修改管理员相关代码' (#81 ) from wanglei_branch into develop

f55bbb69c9 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

ca2d95008f repair人员用户列表接口和User用户列表接口的增删改查添加

c06f010420 Merge pull request 'repair人员用户列表接口和User用户列表接口的增删改查添加' (#82 ) from jingyou_branch into develop

0efd44718b Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

c864f5c685 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

41e99b52aa 修改设备相关代码

d71fca2d5d Merge pull request '修改设备相关代码' (#83 ) from wanglei_branch into develop

1945f99c5b Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

ee5160ea91 修改设备相关代码

15956a5107 Merge pull request '修改设备相关代码' (#84 ) from wanglei_branch into develop

f290b098bf Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

071706c621 维修人员与管理人员的增删改

fe69a6b738 修改维修人员相关代码

5a427c0a1b Merge remote-tracking branch 'origin/develop' into wanglei_branch

a8f3106d09 Merge pull request '修改维修人员相关代码' (#85 ) from wanglei_branch into develop

83335b9cb6 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

6e4db4ccfe Merge pull request '管理界面增删改' (#86 ) from zhanghongwei_branch into develop

ea502f67df Merge remote-tracking branch 'origin/develop' into wanglei_branch

ee5b4e6148 修改查看设备相关代码

9e18004467 Merge pull request '修改查看设备相关代码' (#87 ) from wanglei_branch into develop

f50e4f13ce Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

0e32620383 迭代开发计划第三稿

0347b71c85 repair人员根据片区查询

63c6af26f4 Merge remote-tracking branch 'origin/develop' into develop

62b4164384 增加查询设备接口代码

79d97736a8 Merge pull request '增加查询设备接口代码' (#88 ) from wanglei_branch into develop

98e3b6c41b Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

7cbd93691c app1设备查看功能

app1第一次迭代功能实现 #89