Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/marketingManage/marketing/waitAddedMarketing/add.tsx

@@ -266,8 +266,10 @@ const AddedMarketing = (props: any) => {
         memberLevelId: item.id,
         memberType: item.memberType,
         memberTypeName: item.memberTypeName,
-        roleType: item.roleId,
-        roleTypeName: item.roleName,
+        roleType: item.roleType,
+        roleTypeName: item.roleTypeName,
+        roleId: item.roleId,
+        roleName: item.roleName,
         level: item.level,
         levelType: item.levelType,
         levelTypeName: item.levelTypeName,

src/pages/pageCustomized/mobileEdit/index.tsx

@@ -226,8 +226,8 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
     const param: any = {
       current: 1,
       pageSize: 1,
-      sortType: 2,
-      recommendLabel: [2, 3],
+      type: 2,
+      // recommendLabel: [2, 3],
     }
     const res = await getManageContentInformationPage(param)
     if (res.code === 1000 && res.data.data) {