public-base/src/main/java/com/gingersoft/gsa/cloud/database/bean · 1305e525f65fa3af4fde586f71590b2d432fa300 · Wyh / supplier

Merge remote-tracking branch 'origin/master' · 6f150c1a

# Conflicts:
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

committed Mar 11, 2020

6f150c1a

Name	Last commit	Last Update
..
ComboItem.java		Loading commit data...
Food.java		Loading commit data...
FoodCombo.java		Loading commit data...
FoodModifier.java		Loading commit data...
Function.java		Loading commit data...
Modifier.java		Loading commit data...
PrinterDeviceBean.java		Loading commit data...