Merge branch 'main' of http://192.168.18.119:3000/guohuawei/daoyou-ui

src/api/manage/banned/types.ts

@@ -52,26 +52,16 @@ export interface BannedVO {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify: number;
-
-  /**
-   * 举报时间
-   */
-  createTime: string;
-
-  /**
-   * 操作人
-   */
-  updateBy: number;
-
-  /**
-   * 操作时间
-   */
-  updateTime: string;
+  type: number;
 
 }
 
 export interface BannedForm extends BaseEntity {
+  /**
+   * 唯一标识ID
+   */
+  id?: string | number;
+
   /**
    * 被举报内容id
    */
@@ -120,7 +110,7 @@ export interface BannedForm extends BaseEntity {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify?: number;
+  type?: number;
 
 }
 
@@ -174,7 +164,7 @@ export interface BannedQuery extends PageQuery {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify?: number;
+  type?: number;
 
     /**
      * 日期范围参数

src/api/manage/notebook/index.ts

@@ -73,11 +73,12 @@ export const tagall = (): AxiosPromise<NotebookVO> => {
 };
 /**
  * 查询景点
- * @param id
+ * @param query
  */
-export const contentall = (): AxiosPromise<NotebookVO> => {
+export const contentall = (query?: NotebookQuery): AxiosPromise<NotebookVO> => {
   return request({
     url: '/manage/content/all',
-    method: 'get'
+    method: 'get',
+    params: query
   });
 };