Merge branch 'dev' into dev_zj

zss

2025-02-20 5101e344b4ac9de94d0f18d8a501158be49221ff

 ruoyi-system/src/main/java/com/ruoyi/system/service/CustomService.java

@@ -14,7 +14,7 @@
*/
public interface CustomService extends IService<Custom> {

    Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom);
    IPage<Custom> selectCustomPageList(IPage<Custom> page, Custom custom);

    int delCustomById(Long id);