Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -130,7 +130,7 @@
           show-cancel-button
           @confirm="reselected"
         >
-          <person-list @selected="selected" :type="1"></person-list>
+          <person-list @selected="selected" :type="1" siteId=""></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>