Merge remote-tracking branch 'origin/master'

admin

2019-05-20 76f106ff49cc9de59e29d8b6a0d67d351b7e6d07

 fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandClassShopMapper.xml

@@ -100,7 +100,7 @@
  <select id="countEffective" resultType="Long">
     SELECT IFNULL(COUNT(b.`bcs_cid`),0) FROM  yeshi_ec_brand_class_shop b
   LEFT JOIN `yeshi_ec_taobao_shop_info` p ON b.`bcs_shop_id` = p.`tsi_id`
   WHERE 1=1 
   WHERE b.bcs_state = 1 
      <if test="cid != null and cid !=0 ">
         AND b.`bcs_cid` = #{cid}
      </if>