解决合并冲突问题

xjrsoft-vue3/src/api/jcsj/cjx/model/CjxModel.ts

@@ -8,8 +8,6 @@ export interface MesCollectionItemPageParams extends BasicPageParams {
 
 
   contentType: string;
   contentType: string;
 
 
-  qualityCategoryId: string;
-
   name: string;
   name: string;
 
 
   qualityCategoryId: string;
   qualityCategoryId: string;
@@ -31,44 +29,6 @@ export interface MesCollectionItemPageModel {
 
 
   dataType: string;
   dataType: string;
 
 
-  standardValue: string;
-
-  qualityCategoryId: string;
-}
-
-/**
- * @description: MesCollectionItem表类型
- */
-export interface MesCollectionItemModel {
-  id: string;
-
-  code: string;
-
-  name: string;
-
-  required: string;
-
-  categoryId: string;
-
-  contentType: string;
-
-  dataType: string;
-
-  dictId: string;
-
-  relatedModelId: string;
-
-  relatedModelName: string;
-
-  relatedModelDomain: string;
-
-  standardValue: string;
-
-  upperValue: string;
-
-  lowerValue: string;
-
-  note: string;
   qualityCategoryId: string;
   qualityCategoryId: string;
 }
 }
 
 
@@ -136,25 +96,6 @@ export interface MesCollectionItemModel {
 
 
   mesCollectionScItOptionList?: MesCollectionScItOptionModel;
   mesCollectionScItOptionList?: MesCollectionScItOptionModel;
 }
 }
-  companyId: string;
-
-  qualityCategoryId: string;
-
-  analysisMethod: string;
-
-  qualityMethodId: string;
-
-  destructive: string;
-
-  keyItem: string;
-
-  deleteMark: string;
-
-  createDate: string;
-
-  createUserId: string;
-
-  modifyDate: string;
 
 
 /**
 /**
  * @description: MesCollectionScItOption表类型
  * @description: MesCollectionScItOption表类型