Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/CostIncomeGroupMapper.xml

@@ -59,7 +59,7 @@
     </select>
 
     <select id="getCollections" resultType="com.imed.costaccount.model.vo.CollectionVO">
-        select file_id, date_year, date_month, sum(amount) as amount
+        select file_id, date_year as `year`, date_month as `month`, sum(amount) as amount
         from cost_income_group
         where hosp_id = #{hospId}
         <if test="date != null and date != ''">