Conflicts:
	app/src/main/java/com/yiring/app/service/location/tag/impl/LocationTagServiceImpl.java
	app/src/main/java/com/yiring/app/web/map/MapController.java
	basic-common/core/build.gradle

# Conflicts:
#	app/src/main/java/com/yiring/app/web/map/MapController.java

1、修复提示信息
2、分配标签
3、按键报警数据

# Conflicts:
#   app/src/main/java/com/yiring/app/web/map/MapController.java

1、播报语音

1、按键报警规则

 Conflicts:
	app/src/main/java/com/yiring/app/web/map/MapController.java

1、用户同步

1、部门同步zy

Dev tzl

查看合并请求 chemical-kesai/kshg-api!17

1、修复feign-okhttp

1、加入feign-okhttp
2、相关检索、分配标签