Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/prod/product/brand/dao/BrandDao.java

@@ -49,9 +49,9 @@ public interface BrandDao extends JpaSpecificationExecutor<Brand>, JpaRepository
      * @param num 数量
      * @return
      */
-    @Query(nativeQuery = true, value = "SELECT * from (SELECT * FROM product$brand b " +
+    @Query(nativeQuery = true, value = "SELECT * FROM product$brand b " +
 			"JOIN (SELECT br_name_cn, sum(go_reserve) as s FROM TRADE$GOODS GROUP BY BR_NAME_CN) g" +
-			" on b.br_name_cn = g.br_name_cn order by g.s DESC) where rownum <= :num")
+			" on b.br_name_cn = g.br_name_cn order by g.s DESC limit :num")
     public List<Brand> findHotBrands(@Param("num") Integer num);
 
 	/**