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

guoshilong

2023-05-22 821ca9ad40883ce823fcf215b3b4f8bc07cc0e66

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml

@@ -32,6 +32,7 @@
        <if test="param2!=null  and param2!=''">
            and role_alias &lt;&gt; #{param2}
        </if>
        ORDER BY sort
    </select>

    <select id="treeByParentId" resultMap="treeNodeResultMap">