Merge branch 'hotfix/1.0.33' hotfix/1.0.34 master 1.0.33
-rw-r--r-- 689 .gitignore
-rw-r--r-- 720 Makefile
-rw-r--r-- 608 build.gradle
drwxr-xr-x - bus-qrcode
drwxr-xr-x - config
-rw-r--r-- 70 gradle.properties
drwxr-xr-x - gradle
-rwxr-xr-x 5305 gradlew
-rw-r--r-- 2269 gradlew.bat
drwxr-xr-x - oauth
drwxr-xr-x - payapi-common
drwxr-xr-x - payapi-sdk
drwxr-xr-x - payapi
-rw-r--r-- 113 settings.gradle
drwxr-xr-x - ynrcc-agent