Skip to content

huangzhicong / SmartCanteen

Go to a project
Switch branch/tag
  1. 08 May, 2020 3 commits
  3. 07 May, 2020 2 commits
  5. 29 Apr, 2020 3 commits
    • 删除因重命名导致冗余的代码文件 · 47474660
      pye52 committed
    • Merge branch 'fea-cmpt' into develop · bbc3bf26 
      # 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
      pye52 committed
    • 更新第三方库版本 · 4249d8f8
      pye52 committed
  7. 26 Mar, 2020 1 commit
  9. 25 Mar, 2020 1 commit
  11. 22 Mar, 2020 1 commit
  13. 20 Mar, 2020 5 commits
  15. 19 Mar, 2020 2 commits
  17. 18 Mar, 2020 6 commits
  19. 17 Mar, 2020 14 commits
  21. 16 Mar, 2020 2 commits