Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/MenuMapper.xml

@@ -30,7 +30,6 @@
                                and ur.hosp_id = #{hospId}
                                and rm.hosp_id = #{hospId})
           and sm.type != 3
-        order by order_num asc
     </select>
     <select id="getAllParentNav" resultType="com.imed.costaccount.model.vo.NavVO">
         select *
@@ -44,7 +43,6 @@
                                and ur.hosp_id = #{hospId}
                                and rm.hosp_id = #{hospId})
           and sm.type = 0
-        order by order_num asc
     </select>