Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -1093,6 +1093,7 @@ class UserRepository extends BaseRepository
                     if($award_type == 1){
                         // 增加
                         $isert_data['pm'] = 1;
+                        $isert_data['gzc'] = 1;
                         Db::name('user')->where('uid',$user['uid'])->inc('annuity', $num)->update();
                     }else{
                         // 减少