Merge branch 'main' of https://gitee.com/dapppp/ruoyi-plus-vben5 into dev

apps/web-antd/src/api/common.d.ts

@@ -21,13 +21,20 @@ export interface PageResult<T = any> {
 
 /**
  * 分页查询参数
+ *
+ * 排序支持的用法如下:
+ * {isAsc:"asc",orderByColumn:"id"} order by id asc
+ * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
+ * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc
+ * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc
+ *
  * @param pageNum 当前页
  * @param pageSize 每页大小
  * @param orderByColumn 排序字段
  * @param isAsc 是否升序
  */
 export interface PageQuery {
-  isAsc?: boolean;
+  isAsc?: string;
   orderByColumn?: string;
   pageNum?: number;
   pageSize?: number;