moduleMain/src/main/res/layout · 458d536210ffd99b9d720cd8a578840507cc8a32 · 王雪伟 / magicbox

Merge remote-tracking branch 'origin/master' · 458d5362

王雪伟 authored Mar 11, 2022

# Conflicts:
#	moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemGoodsAdapter.kt
#	moduleMain/src/main/res/layout/items_layout_box_order.xml

458d5362

Name	Last commit	Last update
..
activity_layout_edit_address.xml		Loading commit data...
activity_layout_goods_detail.xml		Loading commit data...
activity_layout_goods_receive.xml		Loading commit data...
activity_layout_logistics.xml		Loading commit data...
activity_layout_lottery_box.xml		Loading commit data...
activity_layout_lottery_reslut.xml		Loading commit data...
activity_layout_my_magic_coin.xml		Loading commit data...
activity_layout_my_order.xml		Loading commit data...
activity_layout_new_box_goods_detail.xml		Loading commit data...
activity_layout_order_detail.xml		Loading commit data...
activity_layout_order_success.xml		Loading commit data...
activity_layout_receive_address.xml		Loading commit data...
activity_layout_recover_detail.xml		Loading commit data...
activity_layout_shipment_success.xml		Loading commit data...
activity_layout_shop_goods_detail.xml		Loading commit data...
activity_layout_shop_order.xml		Loading commit data...
activity_layout_submit.xml		Loading commit data...
activity_layout_third_party_login.xml		Loading commit data...
activity_layout_warehouse.xml		Loading commit data...
activity_login.xml		Loading commit data...
activity_splash.xml		Loading commit data...
auto_list_item.xml		Loading commit data...
dialog_layout_box_result.xml		Loading commit data...
dialog_layout_discount.xml		Loading commit data...
dialog_layout_free_goods.xml		Loading commit data...
dialog_layout_newpeople.xml		Loading commit data...
dialog_layout_props_card.xml		Loading commit data...
dialog_layout_recycle.xml		Loading commit data...
dialog_layout_shop_tips.xml		Loading commit data...
fragment_home.xml		Loading commit data...
fragment_layout_magic_box_order.xml		Loading commit data...
fragment_layout_other.xml		Loading commit data...
fragment_layout_shop.xml		Loading commit data...
fragment_recycled_layout.xml		Loading commit data...
fragment_refresh_layout.xml		Loading commit data...
fragment_refresh_layout2.xml		Loading commit data...
fragment_shop_order.xml		Loading commit data...
fragment_warehouse.xml		Loading commit data...
fragment_warehouse_layout.xml		Loading commit data...
home_item_goods_layout.xml		Loading commit data...
item_goods_pool.xml		Loading commit data...
item_goods_pool2.xml		Loading commit data...
item_goods_top.xml		Loading commit data...
item_layout_address.xml		Loading commit data...
item_layout_box.xml		Loading commit data...
item_layout_magic_coin.xml		Loading commit data...
item_layout_new_box.xml		Loading commit data...
item_layout_order.xml		Loading commit data...
item_layout_pick_up.xml		Loading commit data...
item_layout_receive.xml		Loading commit data...
item_layout_recover.xml		Loading commit data...
item_layout_recover_detail.xml		Loading commit data...
item_layout_shop_goods.xml		Loading commit data...
item_layout_shop_order.xml		Loading commit data...
item_load_more.xml		Loading commit data...
items_layout_box_order.xml		Loading commit data...
items_order_layout.xml		Loading commit data...
layout_detail_content.xml		Loading commit data...
layout_detail_content2.xml		Loading commit data...
layout_detail_title.xml		Loading commit data...
layout_detail_top.xml		Loading commit data...
layout_detail_top2.xml		Loading commit data...
layout_empty.xml		Loading commit data...
layout_home_top.xml		Loading commit data...
layout_new_people.xml		Loading commit data...
layout_popup_protection_poll.xml		Loading commit data...
layout_top_box.xml		Loading commit data...
layout_top_head.xml		Loading commit data...
middle_list_item.xml		Loading commit data...
popup_layout_recover.xml		Loading commit data...
view_navigation_bottom.xml		Loading commit data...