# Conflicts: # app/build.gradle # app/src/main/java/com/bgycc/smartcanteen/RootApp.java # app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java # app/src/main/java/com/bgycc/smartcanteen/entity/PayData.java # app/src/main/java/com/bgycc/smartcanteen/qrcode/DefaultQRCodeScan.java # app/src/main/java/com/bgycc/smartcanteen/socket/SCWebSocketClient.java # app/src/main/java/com/bgycc/smartcanteen/utils/DangerousUtils.java # app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java # app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOnlineViewModel.java # app/src/main/java/com/bgycc/smartcanteen/viewModel/QRCodeViewModel.java # build.gradle # daemon/build.gradle # 智慧食堂开发文档.docx
