merge

src/pages/system/library/borrow/borrow.vue

@@ -13,7 +13,6 @@
     <div v-else>
 
       <!-- 用户信息区 -->
-<<<<<<< HEAD
       <div :style="{ marginBottom: '20px', paddingBottom: '20px', borderBottom: '1px solid #eee' }">
         <el-row :gutter="20">
           <el-col :span="4">
@@ -33,25 +32,6 @@
           </el-col>
         </el-row>
       </div>
-=======
-      <el-form label-width="100px" inline>
-        <el-form-item label="姓名">
-          <span>{{ borrowHistory.CustomerName }}</span>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="在借数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="逾期数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="历史是否有逾期">
-          <span>{{ borrowHistory.CustomerPhone === 1 ? '是' : '否' }}</span>
-        </el-form-item>
-      </el-form>
->>>>>>> 2f5bd0fb8b8c339e52c3b1bb4a54c9b1ec57ac07
 
       <!-- 过滤条件 -->
       <el-form inline>