modify by charles
Merge branch 'f-payment-usuallyPay' of https://github.com/charleslei/work into f-payment-usuallyPay