app/src/main/java/com/bgycc/smartcanteen/viewModel · a80af9ecfda867aaf22f151788a586ded7bdd22d · huangzhicong / SmartCanteen

Merge branch 'fea-payoffline_split' of… · a80af9ec

Merge branch 'fea-payoffline_split' of https://git.bgy.com.cn/bu00302/dining-android into fea-payoffline_split

# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/data/dao/PayDataDao.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java

committed May 08, 2020

a80af9ec

Name	Last commit	Last Update
..
CommandViewModel.java		Loading commit data...
PayOfflineViewModel.java		Loading commit data...
PayOnlineViewModel.java		Loading commit data...
QRCodeViewModel.java		Loading commit data...
ViewModelFactory.java		Loading commit data...