no message

516aeca3 · lixinming · 9e491691 · 516aeca3
Commit 516aeca3 authored Jan 15, 2025 by lixinming
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 4 deletions

outPutConfig.ts src/config/outPutConfig.ts +1 -4

No files found.
--- a/src/config/outPutConfig.ts
+++ b/src/config/outPutConfig.ts
@@ -41,13 +41,10 @@ export enum UNITAUDITINGCOLUMNS {
    单位简介 = "danWeiJianJie",
    
    标签 = "lableId",
-<<<<<<< HEAD
    状态 = "memberState",
    届次 = "session",
-    职务 = "memberLevel"
-=======
+    职务 = "memberLevel",
    会员职务 = "memberLevel",
->>>>>>> e695d6ba2ccab167b3543e786c0abbc49e412567
 }