merger
修改赞的bug