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

types/src/interface/enterprise.ts

@@ -9,7 +9,8 @@ export enum Relationship {
 export interface IMember {
   userID: string;
   memberName: string;
-  activated: boolean;
+  position: string;
+  status: 'normal' | 'disabled' | 'unconfirmed';
   cptList: string[];
   createProject: 'yes' | 'no';
   projectView: 'self' | 'all';

types/src/interface/user.ts

@@ -85,10 +85,7 @@ export interface IUser {
   ID: string;
   ssoID: string;
   mobile: string;
-  email: string;
-  qq: string;
   realName: string;
-  avatar: string;
   createTime: number;
   proCptList: IProCptItem[];
   usedCptList: IUsedCptItem[];