Explorar o código

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

zhijiezhao %!s(int64=3) %!d(string=hai) anos
pai
achega
5fa4465c42
Modificáronse 1 ficheiros con 0 adicións e 1 borrados
  1. 0 1
      src/main/resources/mapper/PageMapper.xml

+ 0 - 1
src/main/resources/mapper/PageMapper.xml

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