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
