Merge remote-tracking branch 'origin/master'

lyh

昨天 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java

@@ -1,8 +1,8 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.request.DeviceCharactersRequest;

public interface IDeviceCharactersService extends IService<DeviceCharacters> {
@@ -14,6 +14,6 @@
     * @param deviceCharactersRequest
     * @return
     */
    QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);
    Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);

}