rollback 'system_type' from menu class
This commit is contained in:
parent
0377d4af39
commit
a911e8b162
|
|
@ -68,8 +68,8 @@ public class SysMenu extends BaseEntity
|
||||||
/** 子菜单 */
|
/** 子菜单 */
|
||||||
private List<SysMenu> children = new ArrayList<SysMenu>();
|
private List<SysMenu> children = new ArrayList<SysMenu>();
|
||||||
|
|
||||||
/** 系统类型 */
|
// /** 系统类型 */
|
||||||
private String systemType;
|
// private String systemType;
|
||||||
|
|
||||||
public Long getMenuId()
|
public Long getMenuId()
|
||||||
{
|
{
|
||||||
|
|
@ -238,13 +238,13 @@ public class SysMenu extends BaseEntity
|
||||||
this.children = children;
|
this.children = children;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSystemType() {
|
// public String getSystemType() {
|
||||||
return systemType;
|
// return systemType;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setSystemType(String systemType) {
|
// public void setSystemType(String systemType) {
|
||||||
this.systemType = systemType;
|
// this.systemType = systemType;
|
||||||
}
|
// }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
|
@ -267,7 +267,7 @@ public class SysMenu extends BaseEntity
|
||||||
.append("updateBy", getUpdateBy())
|
.append("updateBy", getUpdateBy())
|
||||||
.append("updateTime", getUpdateTime())
|
.append("updateTime", getUpdateTime())
|
||||||
.append("remark", getRemark())
|
.append("remark", getRemark())
|
||||||
.append("systemType", getSystemType())
|
// .append("systemType", getSystemType())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,11 +25,11 @@
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark" />
|
||||||
<result property="systemType" column="system_type"/>
|
<!-- <result property="systemType" column="system_type"/>-->
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectMenuVo">
|
<sql id="selectMenuVo">
|
||||||
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time,system_type
|
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
|
||||||
from sys_menu
|
from sys_menu
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|
@ -151,7 +151,7 @@
|
||||||
<if test="icon !=null and icon != ''">icon = #{icon},</if>
|
<if test="icon !=null and icon != ''">icon = #{icon},</if>
|
||||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
<if test="systemType != null and systemType != ''">system_type = #{systemType},</if>
|
<!-- <if test="systemType != null and systemType != ''">system_type = #{systemType},</if>-->
|
||||||
update_time = sysdate()
|
update_time = sysdate()
|
||||||
</set>
|
</set>
|
||||||
where menu_id = #{menuId}
|
where menu_id = #{menuId}
|
||||||
|
|
@ -175,7 +175,7 @@
|
||||||
<if test="icon != null and icon != ''">icon,</if>
|
<if test="icon != null and icon != ''">icon,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="systemType != null and systemType != ''">system_type,</if>
|
<!-- <if test="systemType != null and systemType != ''">system_type,</if>-->
|
||||||
create_time
|
create_time
|
||||||
)values(
|
)values(
|
||||||
<if test="menuId != null and menuId != 0">#{menuId},</if>
|
<if test="menuId != null and menuId != 0">#{menuId},</if>
|
||||||
|
|
@ -194,7 +194,7 @@
|
||||||
<if test="icon != null and icon != ''">#{icon},</if>
|
<if test="icon != null and icon != ''">#{icon},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
<if test="systemType != null and systemType != ''">#{systemType},</if>
|
<!-- <if test="systemType != null and systemType != ''">#{systemType},</if>-->
|
||||||
sysdate()
|
sysdate()
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue