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

2025-11-04 14:38:50 +08:00
parent c2b0a91ffc f32bce424b
commit 2153b1325c
354 changed files with 10376 additions and 6447 deletions
--- a/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts
@@ -18,6 +18,7 @@ export namespace MallRewardActivityApi {
  export interface RewardActivity {
    id?: number; // 活动编号
    name?: string; // 活动名称
+    status?: number; // 活动状态
    startTime?: Date; // 开始时间
    endTime?: Date; // 结束时间
    startAndEndTime?: Date[]; // 开始和结束时间（仅前端使用）