build.gradle
4.91 KB
-
Merge branch 'fea-ref_qrcode' into fea-phone · 3e83af96
# Conflicts: # app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java
pye52 committed
# Conflicts: # app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java