Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-09-18 298fabfdecca5dccd20129a59090003daa00f44d

 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -118,7 +118,7 @@
   
   <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
      <include refid="selectMenuVo"/>
      where menu_name=#{menuName} and parent_id = #{parentId}
      where menu_name=#{menuName} and parent_id = #{parentId} limit 1
   </select>
   
   <update id="updateMenu" parameterType="SysMenu">