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

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

Merge dev

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

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

1、修复定位接口并合并

1、职位信息分页、导出修复

1、定位标签卡相关操作

 Conflicts:
	app/build.gradle

1、线程池
2、封装zyHttpService

1、添加hutool相关依赖
2、封装对zy常用的工具类(发送请求、获取token)

1、实现对定位标签的相关操作(未同步)
2、添加hutool相关依赖

1、添加myexcel依赖库
2、实现对职位数据的相关操作