Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

src/scrm_pages/activity/activity.vue

@@ -15,7 +15,6 @@
               </p>
             </div>
             <div class="people">
-<<<<<<< HEAD
               <p>100人已报名</p>
             </div>
           </div>
@@ -112,9 +111,7 @@
             </div>
             <div class="people">
               <p>100人已报名</p>
-=======
               <p>{{it.join_num}}</p>
->>>>>>> b16550aa910aaf7d56c03d34730cdaf88ad2c98f
             </div>
           </div>
         </div>