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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -868,8 +868,8 @@ FROM
         a.phone,
         a.picture,
         a.sex,
-        "customer" AS type,
         a.building_id AS buildingId,
+        "customer" AS type,
         a.create_date as createDate,
         a.realty_consultant AS consultant,
         a.STATUS AS customerStatus,
@@ -922,7 +922,7 @@ FROM
                 #{personBuilding.buildingId}
             </foreach>
         </if>
-        ORDER BY create_date
+        ORDER BY createDate DESC
     </select>
 
     <select id="getCustomerListOfConsultant" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">