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

src/main/resources/mapper/PageMapper.xml

@@ -195,7 +195,6 @@
             p.price1 as price,
             p.costPrice,
             ifnull(p.costCheckFlag,1) as costCheckFlag,
-            p.shopID as shopId,
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,