Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2026-06-24 bfdc0e0e6d5e47aa501f9b6fadd143d9c97cf00a

 src/views/mall/promotion/discountActivity/modules/form.vue

@@ -9,15 +9,15 @@

import { computed, ref } from 'vue';

import { useVbenForm, useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
import { PromotionDiscountTypeEnum } from '..\..\..\..\..\packages\constants\src';
import { useVbenForm, useVbenModal } from '../../../../../packages/effects/common-ui/src';
import { PromotionDiscountTypeEnum } from '../../../../../packages/constants/src';
import {
  cloneDeep,
  convertToInteger,
  erpCalculatePercentage,
  formatToFraction,
  yuanToFen,
} from '..\..\..\..\..\packages\utils\src';
} from '../../../../../packages/utils/src';

import { Button, InputNumber, message } from 'ant-design-vue';