Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Business/Litdck/Litdckp.vue

@@ -12,12 +12,8 @@
             <c-button
             size="small"
             style="margin-left: 10px; padding: 0 10px"
-<<<<<<< HEAD
-            type="primary">
-=======
             type="primary"
             @click="onSeainf">
->>>>>>> 718729ac237171c470ebca38b9d9e6edcff1a454
               <span style="font-family: '宋体'; font-weight: bold">i</span>
             </c-button>
             </template>
@@ -144,10 +140,7 @@
                 style="margin: 0 10px 0 10px; padding: 0 12px"
                 size="small"
                 type="primary"
-<<<<<<< HEAD
-=======
                 @click="onSeainf"
->>>>>>> 718729ac237171c470ebca38b9d9e6edcff1a454
                 icon="el-icon-search"
               >
                 <span style="font-family: '宋体'; font-weight: bold"></span>