Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into master

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -43,14 +43,23 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_,is_affix_,is_iframe_,link_path_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive},#{isAffix},#{isIframe},#{linkPath})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu">
         UPDATE sys_menu
         <set>
+            <if test="isAffix != null">
+                is_affix_ = #{isAffix},
+            </if>
+            <if test="isIframe != null">
+                is_iframe_ = #{isIframe},
+            </if>
+            <if test="linkPath != null">
+                link_path_ = #{linkPath},
+            </if>
             <if test="parentId != null">
                 parent_id_ = #{parentId},
             </if>