Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

# Conflicts:
#	src/config/outPutConfig.ts

src/config/outPutConfig.ts

@@ -41,9 +41,13 @@ export enum UNITAUDITINGCOLUMNS {
     单位简介 = "danWeiJianJie",
     
     标签 = "lableId",
+<<<<<<< HEAD
     状态 = "memberState",
     届次 = "session",
     职务 = "memberLevel"
+=======
+    会员职务 = "memberLevel",
+>>>>>>> e695d6ba2ccab167b3543e786c0abbc49e412567
 }
 
 
@@ -70,7 +74,9 @@ export enum AUDITINGCOLUMNS {
     标签 = "lableId",
     状态 = "memberState",
     届次 = "session",
-    级别 = "memberLevel"
+    级别 = "memberLevel",
+    会员职务 = "memberLevel",
+    会员级别 = "individualMemberType"
 }