order/component-order-detail/src · 864fd762983abf1292ae9ab4ae1c05bc77d184e9 · Wyh / supplier

Merge remote-tracking branch 'origin/master' · 864fd762

# Conflicts:
#	user/component-login/src/main/AndroidManifest.xml
#	user/component-login/src/main/java/com/gingersoft/gsa/cloud/user/login/LoginActivity.java
#	user/component-login/src/main/res/layout/user_login_activity.xml

committed Dec 20, 2019

864fd762

Name	Last commit	Last Update
..
androidTest/java/com/gingersoft/cloud/gsa/component/order/list		Loading commit data...
main		Loading commit data...
test/java/com/gingersoft/cloud/gsa/component/order/list		Loading commit data...