# Conflicts: # star_lock/lib/blue/blue_manage.dart # star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart # star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart # star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart # star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart