Merge remote-tracking branch 'origin/satoken' into dev

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

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

@@ -12,7 +12,7 @@
 *
 * @author Lion Li
 */
public interface ISysOperLogService extends IService<SysOperLog> {
public interface ISysOperLogService {

    TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery);