diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml
index 48af435..0be1a5d 100644
--- a/template/listOperations/listOperations.wxml
+++ b/template/listOperations/listOperations.wxml
@@ -16,12 +16,8 @@
             <image class="page-action-circle-icon" mode="widthFix" src="/img/arrow-gray.png"></image>
         </view>
     </view>
-<<<<<<< HEAD
     <view class="longString" wx:if="{{ index != 'floor' && index != 'orderby'&&!item.last }}"></view>
-=======
-    <view class="longString" wx:if="{{ index != 'floor' && index != 'orderby'&&!item.last&&!item.show }}"></view>
 
->>>>>>> 71b7e23abfa258e9cead5065ea17bfa13d54711e
     <!-- <view class="longString" wx:if="{{ index != 'floor' && index != 'orderby' }}"></view> -->
 </template>