Merge branch 'dev_fix_sub' into user_action

peng

2025-10-15 92bd763024d8b6e53ea4b784ae81719ee2559bc0

 pages/promotion/joinGroup.vue

@@ -33,7 +33,7 @@
   import '@/components/uview-components/uview-ui'
   import * as API_Promotions from "@/api/promotions";
   import * as API_Goods from "@/api/goods";
   import goodsTemplate from '@/pages/subComponents/m-goods-list/promotion.vue'
   import goodsTemplate from '@/pages/promotion/m-goods-list/promotion.vue'
   export default {
      components: {
         goodsTemplate