Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/lxMall/shopList/list.tsx

@@ -83,7 +83,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
             </div>
             <div className={styles.shop_list_goods}>
               {
-                item.commodityList && item.commodityList.map((commodityItem, commodityIndex) => commodityIndex < 2 && (
+                item.productList && item.productList.map((commodityItem, commodityIndex) => commodityIndex < 2 && (
                   <Link to={`/shop/commodity/detail?id=${commodityItem.id}&shopId=${btoa(JSON.stringify({ shopId: item.id, memberId: item.memberId }))}`} key={commodityItem.id} target="_blank">
                     <div className={styles.shop_list_goods_item}>
                       <div className={styles.shop_list_goods_item_imgbox}>