print-module/src/main/res/layout · 17ab71e19ce1013f6dc86e71dca97ade6bbc6aa7 · Wyh / supplier

Merge remote-tracking branch 'origin/dev' into dev · 17ab71e1

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java

committed Nov 24, 2020

17ab71e1

Name	Last commit	Last Update
..
activity_print_add_currency.xml		Loading commit data...
activity_print_test.xml		Loading commit data...
dialog_print_fail_list.xml		Loading commit data...
fragment_ip_print_list.xml		Loading commit data...
fragment_local_print.xml		Loading commit data...
item_print_fail_layout.xml		Loading commit data...
print_bill_adapter_item_bill.xml		Loading commit data...
print_bitmap.xml		Loading commit data...
print_confirm_order_view.xml		Loading commit data...
print_currency_item.xml		Loading commit data...
print_dialog_internet_list.xml		Loading commit data...
print_dialog_select_device.xml		Loading commit data...
print_fail_img_item.xml		Loading commit data...
print_layout_print_progress.xml		Loading commit data...
print_model_dining_table_order_info.xml		Loading commit data...
print_model_foot.xml		Loading commit data...
print_model_half_line.xml		Loading commit data...
print_model_header.xml		Loading commit data...
print_model_meal_member_integer_info.xml		Loading commit data...
print_model_takeaway_member_integer_info.xml		Loading commit data...
print_model_takeaway_order_info.xml		Loading commit data...
print_model_takeaway_total_amount.xml		Loading commit data...
print_model_text_line.xml		Loading commit data...
print_model_textview.xml		Loading commit data...
print_other_order_food.xml		Loading commit data...
print_other_order_food_item.xml		Loading commit data...
print_progress_item.xml		Loading commit data...
print_skyorder_qrcode.xml		Loading commit data...
print_test.xml		Loading commit data...
printer_activity_add.xml		Loading commit data...
printer_activity_list.xml		Loading commit data...
printer_dialog_item.xml		Loading commit data...
printer_item.xml		Loading commit data...