Merge branch 'f-6.6.8' of 192.168.10.6:caosy/fun-golf-service into f-6.6.8

src/main/java/com/ctrip/fun/golf/dao/assemble/AsmCourseResourceDao.java

@@ -1031,7 +1031,7 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
         sqlUnion.append(" UNION ( ");
         sqlUnion.append(" UNION ( ");
         sqlUnion.append(sql2.toString());
         sqlUnion.append(sql2.toString());
         sqlUnion.append(" )");
         sqlUnion.append(" )");
-        sqlUnion.append(" ) u order by u.priceDate");
+        sqlUnion.append(" ) u order by u.priceDate,u.id");
         
         
         sql.append(sqlUnion.toString());
         sql.append(sqlUnion.toString());
         sql_count.append(sqlUnion.toString());
         sql_count.append(sqlUnion.toString());