Merge branch 'feature/NG-27' of ssh://16.162.42.175:8013/guanli/calc-serve into feature/NG-27

# Conflicts:
#	common/helpers/bonus/CalcServeBonusCalc.php

common/helpers/bonus/CalcServeBonusCalc.php

@@ -621,7 +621,6 @@ class CalcServeBonusCalc extends BaseObject {
                 //记录奖金和奖金来源到缓存 并实现在缓存中奖金累加
                 CalcCache::saveFwBonusList($bonusUserId, $this->_periodNum, $fwBonus, ['fromUid'=>$userId, 'fromPvPcs'=>$validPvPcs]);
 //                CalcCache::addHasFwBonusUsers($bonusUserId, $this->_periodNum);
-
                 unset($userId, $validPvPcs);
             }