Merge remote-tracking branch 'origin/master'

admin

2019-04-29 f560f510ed07ccad5e675eddfb0b762cc71ea349

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/mapping/activity/RecommendActivityMapper.xml

@@ -63,7 +63,7 @@
                  AND t.ar_title LIKE '%${title}%' 
             </if>
         ORDER BY t.ar_top DESC,t.ar_order_by ASC,t.ar_create_time DESC 
         LIMIT ${START},${COUNT}
         LIMIT ${start},${count}
    </select>

    <select id="getRecommendActivityCount" resultType="java.lang.Long">

 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>