合并圆角矩形和直角矩形,给半径就为圆角,反之直角.
Merge remote-tracking branch 'origin/master'