# Conflicts: # star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart # star_lock/lib/network/api.dart