Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

types/src/interface/base.ts

@@ -157,6 +157,7 @@ export enum CptModelName {
   approvalStatus = 'approvalStatus', // 审批状态关系表
   gatherMatter = 'gatherMatter', // 事项-前台
   gatherStepMatter = 'gatherStepMatter', // 步骤事项关系表
+  conditionSetting = 'conditionSetting',
 }
 
 // 无数据表的模块名称的枚举

types/src/interface/process.ts

@@ -366,3 +366,9 @@ export interface IBusinessApprovalItem {
   createdID?: string;
   createTime?: string;
 }
+
+export interface IConditionSetting {
+  ID: string;
+  gatherID: string;
+  schema?: string;
+}