# Conflicts: # app/src/main/AndroidManifest.xml
修改PaymentFragment;
# Conflicts: # app/src/main/res/values/strings.xml
