Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/CostCostingGroupMapper.xml

@@ -105,7 +105,7 @@
         and ca.delete_time = 0
     </select>
     <select id="queryAllocation" resultType="com.imed.costaccount.model.vo.AllocationVO">
-        select date_year as year,date_month as month,IFNULL(sum(amount),0) as amount,false as isAllocation
+        select date_year as `year`,date_month as `month`,IFNULL(sum(amount),0) as amount,false as isAllocation
         from cost_costing_group
         where delete_time = 0
         <if test="year != null">