Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/AllocationMapper.xml

@@ -56,7 +56,7 @@
     </select>
 
     <select id="getAllSortLevel" resultType="com.imed.costaccount.model.Allocation">
-        select distinct date_year,date_month,level_sort, share_param_code, share_param_name, create_time
+        select distinct date_year,date_month,level_sort, share_param_code, share_param_name, create_time,id
         from cost_allocation
         where date_year = #{year}
           and date_month = #{month}