Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

# Conflicts:
#	src/main/java/com/yunzhi/marketing/controller/TdBuildingTypeController.java

src/main/java/com/yunzhi/marketing/controller/TdBuildingTypeController.java

             queryWrapper.eq("status", 1);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq("org_id", getOrgId(request));
-
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){

src/main/resources/mapper/TaBuildingMapper.xml

                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                    <![CDATA[ start_price >= ${priceArr[0]}  ]]>
+                                    <![CDATA[ start_price > ${priceArr[0]}  ]]>
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
                                     AND
                             )  or
                             (
                             <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                <![CDATA[ end_price >= ${priceArr[0]}  ]]>
+                                <![CDATA[ end_price > ${priceArr[0]}  ]]>
                             </if>
                             <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
                                 AND