Merge branch 'CRM15.5' into debug

src/views/roadshow_manage/myCalendar.vue

@@ -156,7 +156,7 @@
             <!-- 提交/查看参会名单 按钮由后端控制 -->
             <template v-if="default_tab===2">
                   <span 
-                    class="editsty"
+                    class="deletesty"
                     v-if="row.SubmitButton"
                     @click="currentRsCalendarId=row.RsCalendarId;isAddParticipateShow=true;"
                   >提交参会名单</span>