Conflicts: lib/retrofit/data/settleOrderInfo.dart lib/retrofit/min_api.g.dart lib/store/store_order.dart lib/store/store_view/store_activity.dart