Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java

@@ -13,7 +13,7 @@

    IPage<AdminNavigationBarVo> selectAdminNavigationBarVoInPage(Page<AdminNavigationBarVo> page, @Param("record")NavigationBarEntity navigationBarEntity);

    List<AdminNavigationBarVo> selectAdminNavigationBarVoByParentId(@Param("parentId")Long parentidDefault);
    List<AdminNavigationBarVo> selectAdminNavigationBarVoByParentId(@Param("parentId")Long parentidDefault,@Param("belongId")Long belongId);

    List<NavigationBarEntity> selectListByParentId(@Param("parentId")Long id);
    List<NavigationBarEntity> selectListByParentId(@Param("parentId")Long id,@Param("belongId")Long belongId);
}