Files · 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
app		Loading commit data...
daemon		Loading commit data...
.gitignore		Loading commit data...
README.md		Loading commit data...
build.gradle		Loading commit data...
gradle.properties		Loading commit data...
gradlew		Loading commit data...
gradlew.bat		Loading commit data...
settings.gradle		Loading commit data...
智慧食堂开发文档.docx		Loading commit data...

README.md