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

gongchunyi

昨天 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

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