Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

pages/person-detail/index.vue

@@ -120,7 +120,7 @@
       getPersonDetails() {
         getPersonDetails({
           pageNo: this.pageNo,
-          activityId: 2
+          activityId: this.$route.query.activityId
         }).then(res => {
           console.log(res)
           if(res.code == '000000') {