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

# Conflicts:
#	src/biz/member/examine.ts

src/biz/member/examine.ts

@@ -64,8 +64,8 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
     if (sheng) selectParam.sheng = sheng;
     if (shi) selectParam.shi = shi;
 
-    const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "mail"];
-    let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber);
+    const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "memberType", "mail"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];