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

apps/web-ele/src/api/infra/file-config/index.ts

@@ -16,6 +16,7 @@ export namespace InfraFileConfigApi {
     accessKey?: string;
     accessSecret?: string;
     pathStyle?: boolean;
+    enablePublicAccess?: boolean;
     domain: string;
   }
 

apps/web-ele/src/api/mall/promotion/combination/combinationActivity.ts

@@ -48,6 +48,8 @@ export namespace MallCombinationActivityApi {
     combinationPrice?: number;
     /** 商品列表 */
     products: CombinationProduct[];
+    /** 图片 */
+    picUrl?: string;
   }
 
   /** 扩展 SKU 配置 */

apps/web-ele/src/api/mall/promotion/diy/page.ts

@@ -52,7 +52,7 @@ export function deleteDiyPage(id: number) {
 
 /** 获得装修页面属性 */
 export function getDiyPageProperty(id: number) {
-  return requestClient.get<string>(`/promotion/diy-page/get-property?id=${id}`);
+  return requestClient.get(`/promotion/diy-page/get-property?id=${id}`);
 }
 
 /** 更新装修页面属性 */

apps/web-ele/src/api/mall/promotion/seckill/seckillActivity.ts

@@ -55,6 +55,8 @@ export namespace MallSeckillActivityApi {
     seckillPrice?: number;
     /** 秒杀商品列表 */
     products?: SeckillProduct[];
+    /** 图片 */
+    picUrl?: string;
   }
 
   /** 扩展 SKU 配置 */