Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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

@@ -164,7 +164,7 @@
        <if test="state != null">
           AND cp.`bcs_state` = #{state}
        </if>
   ORDER BY cp.`bcs_cid`,cp.`bcs_top` DESC,cp.`bcs_orderby`
   ORDER BY cp.`bcs_top` DESC,cp.`bcs_orderby`
     LIMIT ${start},${count}
  </select>