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

gongchunyi

2 天以前 6a939851b9561fea92ec29c59fa9e47ab9467ff7

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