Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/AllocationMapper.xml

@@ -49,7 +49,7 @@
         </if>
     </select>
     <select id="queryAfterAllocationListSum" resultType="java.math.BigDecimal">
-        select sum(amount) from cost_allocation where delete_time = 0 and hosp_id = #{hospId}
+        select sum(amount) from cost_allocation_query where delete_time = 0 and hosp_id = #{hospId}
         <if test="dateYear != null">
             and date_year = #{dateYear} and date_month = #{dateMonth}
         </if>