Merge branch 'master' of 192.168.1.41:SmartCost/SCCommon

types/src/interface/user.ts

@@ -91,6 +91,26 @@ export interface IAPOrganizationalStructure {
   name: string;
 }
 
+export interface IQualifications {
+  ID: string;
+  school: string;
+  professional: string;
+  qualifications: string;
+  certificateNo: string;
+  validTime: string;
+  filePath: string;
+}
+
+export interface ICertificate {
+  ID: string;
+  name: string[];
+  professional: string;
+  lv: string;
+  certificateNo: string;
+  validTime: string;
+  filePath: string;
+}
+
 export interface IAPUser {
   ID: string;
   createdTime: number;
@@ -121,30 +141,10 @@ export interface IAPUser {
   reason: string; // 注册审批备注
   qualifications: IQualifications[];
   certificate: ICertificate[];
-  employmentCertificateName: String;
+  employmentCertificateName: string;
+  MAC?: string;
 }
 
-export interface IQualifications {
-  ID: string;
-  school: string;
-  professional: string;
-  qualifications: string;
-  certificateNo: string;
-  validTime: string;
-  filePath: string;
-}
-
-export interface ICertificate {
-  ID: string;
-  name: string[];
-  professional: string;
-  lv: string;
-  certificateNo: string;
-  validTime: string;
-  filePath: string;
-}
-
-
 // 最近联系人
 export interface IRecentUser extends IUser {
   recentDate: number;