Merge branch 'feature-tianyong' into gym-online

src/page-instrument/header-top/settting/index.tsx

@@ -85,7 +85,7 @@ export default defineComponent({
                                     <Switch v-model={state.setting.repeatAutoPlay}></Switch>
                                 </div>
                         }      
-                        {                      
+                        {   !state.isCombineRender &&                    
                             <div class={styles.cellBox}>
                                 <div class={styles.tit}>合并休止小节</div>
                                 <Switch