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

src/main/resources/mapper/ShopMapper.xml

@@ -305,7 +305,6 @@
          organizeId,
          normalPrice,
          price,
-         -- costCheckFlag,
          costprice,
          stock,
          minBuyNumber,
@@ -318,7 +317,6 @@
                 #{organizeId},
                 #{normalPrice},
                 #{price},
-                -- ifnull(#{costCheckFlag}, 1),
                 #{costPrice},
                 #{stock},
                 #{minBuyNumber},