base-module/src/main/res/layout · ecc42b4a8845f4c65ffe279b4fb01577ca0b4369 · Wyh / supplier

Merge remote-tracking branch 'origin/dev' into dev · ecc42b4a

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BillItemAdapter.java

committed Nov 24, 2020

ecc42b4a

Name	Last commit	Last Update
..
activity_web.xml		Loading commit data...
app_save_btn.xml		Loading commit data...
banner_view_layout.xml		Loading commit data...
base_activity_capture_new.xml		Loading commit data...
base_print_bill_adapter_item_bill.xml		Loading commit data...
base_print_item_bill_type.xml		Loading commit data...
base_view_tab_menu.xml		Loading commit data...
dialog_multiple_choice_layout.xml		Loading commit data...
dialog_pay_loading.xml		Loading commit data...
dialog_print_qrcode.xml		Loading commit data...
dialog_select_layout.xml		Loading commit data...
dialog_select_print.xml		Loading commit data...
dialog_select_print_device.xml		Loading commit data...
dialog_tip.xml		Loading commit data...
include_basic_web.xml		Loading commit data...
include_horizontal_color_black_one_dividing_line.xml		Loading commit data...
include_horizontal_color_ccc_dividing_line.xml		Loading commit data...
include_horizontal_color_e8_dividing_line.xml		Loading commit data...
include_horizontal_color_eee_dividing_line.xml		Loading commit data...
include_horizontal_color_f0_dividing_line.xml		Loading commit data...
include_list_save_layout.xml		Loading commit data...
include_number_keyboard.xml		Loading commit data...
include_pay_fast_keyboard.xml		Loading commit data...
include_pay_keyboard.xml		Loading commit data...
include_vertical_color_black_one_dividing_line.xml		Loading commit data...
include_vertical_color_ccc_dividing_line.xml		Loading commit data...
include_vertical_color_e8_dividing_line.xml		Loading commit data...
include_vertical_color_f0_dividing_line.xml		Loading commit data...
item_bill_method.xml		Loading commit data...
item_bill_money.xml		Loading commit data...
item_dialog_select_print.xml		Loading commit data...
item_dialog_select_print_model.xml		Loading commit data...
item_food_menu_category_title.xml		Loading commit data...
item_grid_virtual_keyboard.xml		Loading commit data...
item_list_string_select.xml		Loading commit data...
item_multiple_choice_layout.xml		Loading commit data...
item_num_keyboard.xml		Loading commit data...
item_radio.xml		Loading commit data...
item_skyorder_meal_kind.xml		Loading commit data...
item_thick_line.xml		Loading commit data...
iu_item_base_image_section.xml		Loading commit data...
iu_item_base_text_section.xml		Loading commit data...
layout_default.xml		Loading commit data...
layout_no_data.xml		Loading commit data...
layout_order_pay.xml		Loading commit data...
layout_order_receiving.xml		Loading commit data...
layout_popup_bottom.xml		Loading commit data...
layout_reload.xml		Loading commit data...
layout_table_item.xml		Loading commit data...
layout_virtual_keyboard.xml		Loading commit data...
loadsir_custom.xml		Loading commit data...
loadsir_empty.xml		Loading commit data...
loadsir_error.xml		Loading commit data...
loadsir_loading.xml		Loading commit data...
loadsir_timeout.xml		Loading commit data...
multi_input.xml		Loading commit data...
multi_radio.xml		Loading commit data...
multi_select_dialog.xml		Loading commit data...
multi_title.xml		Loading commit data...
other_order_pause_orders.xml		Loading commit data...
pager_navigator_layout.xml		Loading commit data...
pager_navigator_layout_no_scroll.xml		Loading commit data...
pop_enter_password.xml		Loading commit data...
popup_layout_restaurant_state.xml		Loading commit data...
popup_list_item.xml		Loading commit data...
print_item_food.xml		Loading commit data...
print_kitchen.xml		Loading commit data...
print_kitchen_item_food.xml		Loading commit data...
print_kitchen_item_parent.xml		Loading commit data...
print_layout_print.xml		Loading commit data...
print_layout_print_bill.xml		Loading commit data...
print_select_print_method.xml		Loading commit data...
spinner_item_select.xml		Loading commit data...
table_dialog_intergral_keypad.xml		Loading commit data...
table_dialog_pay_keypad.xml		Loading commit data...
ui_dialog_choose_restaurant.xml		Loading commit data...
ui_dialog_input_number.xml		Loading commit data...
ui_dialog_loading.xml		Loading commit data...
ui_include_number_keyboard.xml		Loading commit data...
ui_item_keyboard.xml		Loading commit data...
ui_layout_search_keyborder.xml		Loading commit data...