Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/pageCustomized/mobileSettingPanel/propsSettings/components/marketingCardGood/index.tsx

@@ -54,6 +54,9 @@ const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCar
       shopId
     };
     const isWithActivityType = actType ? { ...common, activityType: actType } : common;
+    if (exType) {
+      isWithActivityType.minType = exType
+    }
     return await getMarketingAdornPlatformActivityListAdorn(isWithActivityType as any);
   };