guoshilong
2023-05-22 821ca9ad40883ce823fcf215b3b4f8bc07cc0e66
Merge remote-tracking branch 'origin/jtdev' into jtdev
2 files modified
3 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -19,7 +19,7 @@
 * @author Chill
 */
@Data
@TableName("\"tb_res_base\"")
@TableName("\"att_res_base\"")
@ApiModel(value = "水库对象", description = "水库对象")
public class AttResBase implements Serializable {
    private static final long serialVersionUID = 1L;
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">