我喜欢、已购买sql逻辑修改
Merge remote-tracking branch 'origin/master'