Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/resources/mapper/CmBrandLandingMapper.xml

@@ -113,7 +113,7 @@
 			<if test="addTime != null "> and cm_brand_landing.addTime = #{addTime}</if>
 		</where>
 		group by cm_brand_landing.id
-		order by cm_brand_landing.createTime desc
+		order by cm_brand_landing.addTime desc
 		limit 0,1
 	</select>
 
@@ -179,7 +179,7 @@
 			<if test="addTime != null "> and cm_brand_landing.addTime = #{addTime}</if>
 		</where>
 		group by cm_brand_landing.id
-		order by cm_brand_landing.createTime desc
+		order by cm_brand_landing.addTime desc
 	</select>
 
 	<select id="getCmBrandLandingCount" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultType="String">