huangzhicong / SmartCanteen

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