1、修复feign-okhttp

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

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

 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

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/yiring/app/domain/car/Car.java
#	app/src/main/java/com/yiring/app/domain/location/LocationTag.java
#	app/src/main/java/com/yiring/app/param/car/CarParam.java
#	app/src/main/java/com/yiring/app/param/car/CarQueryParam.java
#	app/src/main/java/com/yiring/app/param/dict/DictParam.java
#	app/src/main/java/com/yiring/app/param/dict/DictQueryParam.java
#	app/src/main/java/com/yiring/app/param/dict/DictTypeParam.java
#	app/src/main/java/com/yiring/app/param/dict/DictTypeQueryParam.java
#	app/src/main/java/com/yiring/app/param/video/VideoParam.java
#	app/src/main/java/com/yiring/app/param/video/VideoQueryParam.java
#	app/src/main/java/com/yiring/app/service/car/CarService.java
#	app/src/main/java/com/yiring/app/service/car/impl/CarServiceImpl.java
#	app/src/main/java/com/yiring/app/service/video/VideoService.java
#	app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java
#	app/src/main/java/com/yiring/app/vo/car/CarVo.java
#	app/src/main/java/com/yiring/app/vo/video/VideoVo.java
#	app/src/main/java/com/yiring/app/web/car/CarController.java
#	app/src/main/java/com/yiring/app/web/video/VideoController.java
#	basic-auth/build.gradle
#	basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java
#	basic-common/core/src/main/java/com/yiring/common/dict/Dict.java
#	basic-common/core/src/main/java/com/yiring/common/dict/DictType.java
#	basic-common/util/build.gradle
#	basic-common/util/src/main/java/com/yiring/common/util/DictUtils.java
#	basic-common/util/src/main/java/com/yiring/common/util/StrUtils.java
#	build.gradle

1、部门相关api
2、用户相关api

Merge dev

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

1、部门相关查询、导出
2、用户相关查询、发卡、收卡

1、修复定位接口并合并