print-module/src/main/java/com/joe/print/mvp/ui/adapter · 444f32a4a621dd5a957d283d02218f8214a8e767 · 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
..
DialogPrinterListAdapter.java		Loading commit data...
OtherOrderAdapter.java		Loading commit data...
PrintFailListAdapter.java		Loading commit data...
PrintFileBitmapAdapter.java		Loading commit data...
PrinterListAdapter.java		Loading commit data...