~nishiwei/ard-uav-server.git

倪世伟 / ard-uav-server

forked from uav/ard-uav-server

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-25 aae8b5dc994fffdc211b1f0fc860840cb0d4687a

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

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
      PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.system.mapper.system.SysMenuMapper">
<mapper namespace="com.ard.system.mapper.SysMenuMapper">

   <resultMap type="SysMenu" id="SysMenuResult">
      <id     property="menuId"         column="menu_id"        />

			@@ -2,7 +2,7 @@
			<!DOCTYPE mapper
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.ard.system.mapper.system.SysMenuMapper">
			<mapper namespace="com.ard.system.mapper.SysMenuMapper">

			<resultMap type="SysMenu" id="SysMenuResult">
			<id property="menuId" column="menu_id" />