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

zouyu

2026-01-14 d2f503f72b5485bfee54ea296c7d0a9a243cea02

 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);