library-order/src · 367cd0b3dfe2716badd1abf4a73c9276e9ad6617 · Wyh / supplier

Merge remote-tracking branch 'origin/dev' into dev · 367cd0b3

# Conflicts:
#	component-login/src/main/AndroidManifest.xml
#	component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	library-order/src/main/java/com/gingersoft/gsa/cloud/order/order/DoshokuOrder.java

committed Jan 05, 2021

367cd0b3

Name	Last commit	Last Update
..
androidTest/java/com/gingersoft/runtime/pay_module		Loading commit data...
main		Loading commit data...
test/java/com/gingersoft/runtime/pay_module		Loading commit data...