feat: 111

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -69,9 +69,6 @@ const LockModal = props => {
           // 请求的是第一页
           setState({ ...state, longle, total, laoding: false, ...params })
         } else {
-<<<<<<< HEAD
-          setState({ ...state, longle: state.longle.concat(longle), total, loading: false })
-=======
           setState({
             ...state,
             longle: state.longle.concat(longle),
@@ -79,7 +76,6 @@ const LockModal = props => {
             laoding: false,
             ...params
           })
->>>>>>> 75ff7d4... fix: 锁库数据权限问题
         }
       }
     }