Dev lijing

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

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

1、按键报警规则

1、用户同步

1、部门同步zy

Dev tzl

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

1、修复feign-okhttp

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

1、用户导入、导出
2、部门导入、导出
3、新增根据用户名或手机号码检索

fix: 修复时序表时区 DDL 问题、移除移除 mappedBy 配置、删除重复的 MQ 配置项

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

 Conflicts:
	app/src/main/java/com/yiring/app/domain/location/LocationTag.java

 Conflicts:
	app-push/build.gradle
	app-push/src/main/java/com/yiring/app/push/domain/PushMessage.java
	app-push/src/main/java/com/yiring/app/push/rabbitmq/PushRabbitConfig.java
	app-push/src/main/java/com/yiring/app/push/rabbitmq/PushRabbitReceiver.java
	app-push/src/main/java/com/yiring/app/push/service/PushService.java
	app-push/src/main/java/com/yiring/app/push/service/impl/PushServiceImpl.java
	app/build.gradle
	app/src/main/java/com/yiring/app/domain/location/LocationBeacon.java
	app/src/main/java/com/yiring/app/domain/location/LocationFence.java
	app/src/main/java/com/yiring/app/domain/location/LocationFenceRule.java
	app/src/main/java/com/yiring/app/domain/location/LocationLog.java
	app/src/main/java/com/yiring/app/domain/location/LocationTag.java
	app/src/main/java/com/yiring/app/stomp/WebSocketStompConfig.java
	app/src/main/java/com/yiring/app/util/GeoUtils.java
	basic-auth/build.gradle
	basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java