table-mode/src/main/res/mipmap-xhdpi · ffb75ea0cb93a24a61de16c2ad022dd57aeeefc8 · Wyh / supplier

Merge remote-tracking branch 'origin/master' · 444f32a4

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
#	public-base/src/main/res/values/attrs.xml

committed Apr 27, 2020

444f32a4

Name	Last commit	Last Update
..
ic_clear_text.png		Loading commit data...
ic_meal_add_count.png		Loading commit data...
ic_meal_delete_count.png		Loading commit data...
meal_down.png		Loading commit data...
meal_fine_delete.png		Loading commit data...
meal_fine_end.png		Loading commit data...
meal_fine_info.png		Loading commit data...
meal_fine_taste.png		Loading commit data...
meal_number_key.png		Loading commit data...
meal_people_num.png		Loading commit data...
meal_people_num_white.png		Loading commit data...
table_init.png		Loading commit data...
table_move.png		Loading commit data...
table_paper.png		Loading commit data...
table_skyorder.png		Loading commit data...
table_splite.png		Loading commit data...