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

# Conflicts: # apps/web-antd/src/views/mall/promotion/point/activity/data.ts # apps/web-antd/src/views/mall/promotion/point/activity/index.vue
2025-10-23 12:46:02 +08:00
parent 74bf240f52 8b7780d52d
commit 319e9dc7bd
31 changed files with 176 additions and 136 deletions
--- a/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
@@ -109,7 +109,7 @@ const gridColumns = computed<VxeGridProps['columns']>(() => {
      field: 'marketPrice',
      title: '原价',
      minWidth: 100,
-      formatter: 'formatAmount',
+      formatter: 'formatAmount2',
    },
    {
      field: 'status',