1、解决冲突

package-base-select/pages/select-data/select-data.wxml

@@ -1,11 +1,7 @@
 <loading wx:if="{{loading}}"></loading>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-sticky scroll-top="0">
-<<<<<<< HEAD
-  <view id="stickyView" style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'190rpx': ((searchContent && searchContent.length > 0)?'200rpx':'90rpx')}}">
-=======
   <view style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'210rpx': ((searchContent && searchContent.length > 0)?'200rpx':'120rpx')}}">
->>>>>>> 25849cd66c3de72fdd910c5b873d14c868ea7962
     <!-- 查询条件 -->
     <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,placeholder)}}">
     </dk-dropdown-menu>

project.private.config.json

@@ -5,9 +5,5 @@
         "preloadBackgroundData": false
     },
     "projectname": "iboss_wx_app",
-<<<<<<< HEAD
     "libVersion": "3.3.0"
-=======
-    "libVersion": "3.4.2"
->>>>>>> f955ccdad1d6bd62fe5f8f3d8bfc00ec30c51394
 }