table-mode/src/main/res/layout · f2fd93085022d16bd0f98eadd94312801c9f614d · Wyh / supplier

Merge remote-tracking branch 'origin/master' · f2fd9308

# Conflicts:
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java

committed Mar 18, 2020

f2fd9308

Name	Last commit	Last Update
..
activity_order_center.xml		Loading commit data...
activity_order_detail.xml		Loading commit data...
fragment_all_order.xml		Loading commit data...
include_pay_fast_keyboard.xml		Loading commit data...
include_pay_keyboard.xml		Loading commit data...
item_bill_method.xml		Loading commit data...
item_bill_money.xml		Loading commit data...
item_order_center.xml		Loading commit data...
item_order_detail_food.xml		Loading commit data...
item_order_detail_pay_method.xml		Loading commit data...
meal_food_group_grid.xml		Loading commit data...
meal_item_food.xml		Loading commit data...
meal_item_food_group.xml		Loading commit data...
meal_item_select_meal_stand.xml		Loading commit data...
meal_order_top_function.xml		Loading commit data...
print_select_print_method.xml		Loading commit data...
table_activity_meal_stand.xml		Loading commit data...
table_activity_order_content.xml		Loading commit data...
table_activity_order_pay.xml		Loading commit data...
table_activity_table.xml		Loading commit data...
table_dialog_pay_keypad.xml		Loading commit data...
table_fragment_all_table.xml		Loading commit data...
table_fragment_fine_item_all.xml		Loading commit data...
table_fragment_fine_item_kind.xml		Loading commit data...
table_fragment_input_table.xml		Loading commit data...
table_fragment_state_table.xml		Loading commit data...
table_include_number_input.xml		Loading commit data...
table_item_bottom_function.xml		Loading commit data...
table_item_combo.xml		Loading commit data...
table_item_order_money.xml		Loading commit data...
table_recycler_table.xml		Loading commit data...
table_view_tab_menu.xml		Loading commit data...