|
|
@@ -1,9 +1,5 @@
|
|
|
<template>
|
|
|
-<<<<<<< HEAD
|
|
|
- <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom hide-no-more-inside>
|
|
|
-=======
|
|
|
<z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
|
|
|
->>>>>>> 84bf63a02fd3b1ba91f839dc1cba1e254e5d4b6c
|
|
|
<template #top>
|
|
|
<ut-navbar title="种养殖任务" :fixed="false">
|
|
|
<template #left><view class=""></view></template>
|
