Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/TaRaiseMapper.xml

@@ -18,7 +18,7 @@
             t.org_id = #{orgId}
             AND t.`status` != - 1
         <if test="buildingId != null and buildingId != ''">
-            and t2.building_id = #{buildingId}
+            and t3.building_id = #{buildingId}
         </if>
         <if test="salesBatchName != null and salesBatchName != ''">
             and t2.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')