合并

src/api/progress/progressCategory/types.ts

@@ -84,10 +84,10 @@ export interface ProgressCategoryVO {
    */
   remark: string;
 
-    /**
-     * 子对象
-     */
-    children: ProgressCategoryVO[];
+  /**
+   * 子对象
+   */
+  children: ProgressCategoryVO[];
 }
 
 export interface ProgressCategoryForm extends BaseEntity {
@@ -95,7 +95,8 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  constructionPrice?: string | number;
+  ownerPrice?: string | number;
   /**
    * 父类别id
    */
@@ -175,11 +176,9 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface ProgressCategoryQuery {
-
   /**
    * 父类别id
    */
@@ -255,11 +254,8 @@ export interface ProgressCategoryQuery {
    */
   status?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-