modify merchant send sms
Merge remote-tracking branch 'origin/master'