~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

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

 ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.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.system.mapper.SysRoleMenuMapper">
<mapper namespace="com.ard.system.mapper.SysRoleMenuMapper">

   <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
      <result property="roleId"     column="role_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.system.mapper.SysRoleMenuMapper">
			<mapper namespace="com.ard.system.mapper.SysRoleMenuMapper">

			<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
			<result property="roleId" column="role_id" />