Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts

@@ -38,9 +38,9 @@ export namespace MallDeliveryExpressTemplateApi {
     /** 排序 */
     sort: number;
     /** 计费区域列表 */
-    templateCharge: TemplateCharge[];
+    charges: TemplateCharge[];
     /** 包邮区域列表 */
-    templateFree: TemplateFree[];
+    frees: TemplateFree[];
   }
 
   /** 运费模板精简信息 */

apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts

@@ -29,21 +29,18 @@ export namespace MallDeliveryPickUpStoreApi {
     longitude: number;
     /** 状态 */
     status: number;
-    /** 绑定用户编号组数 */
-    verifyUserIds: number[];
     /** 营业时间 用于fieldMappingTime */
     rangeTime: any[];
+    /** 绑定用户编号组数 */
+    verifyUserIds?: number[];
+    verifyUsers?: any[];
   }
 
   /** 绑定自提店员请求 */
-  export interface BindStaffRequest {
+  export interface DeliveryPickUpBindReqVO {
     id?: number;
-    /** 门店名称 */
-    name: string;
-    /** 门店编号 */
-    storeId: number;
     /** 用户编号列表 */
-    userIds: number[];
+    verifyUserIds: number[];
   }
 }
 
@@ -89,8 +86,8 @@ export function deleteDeliveryPickUpStore(id: number) {
 }
 
 /** 绑定自提店员 */
-export function bindStoreStaffId(
-  data: MallDeliveryPickUpStoreApi.BindStaffRequest,
+export function bindDeliveryPickUpStore(
+  data: MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO,
 ) {
   return requestClient.post('/trade/delivery/pick-up-store/bind', data);
 }