public-base/src/main/res · 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
..
anim		Loading commit data...
color		Loading commit data...
drawable		Loading commit data...
drawable-hdpi		Loading commit data...
drawable-xhdpi		Loading commit data...
drawable-xxhdpi		Loading commit data...
layout		Loading commit data...
mipmap-anydpi-v26		Loading commit data...
mipmap-hdpi		Loading commit data...
mipmap-mdpi		Loading commit data...
mipmap-xhdpi		Loading commit data...
mipmap-xxhdpi		Loading commit data...
mipmap-xxxhdpi		Loading commit data...
raw		Loading commit data...
values		Loading commit data...
xml		Loading commit data...
ic_launcher-web.png		Loading commit data...