Merge branch 'master' of http://git.qiniu1314.com/yingzi/infantServiceApi

app/api/controller/User.php

@@ -1232,7 +1232,7 @@ class User extends BaseController
 //                ->alias("ut")
 //                ->join("show_template t", "t.id = show_template_id","left")
                 ->where($where)
-                ->order("is_default", "desc")
+//                ->order("is_default", "desc")
                 ->order("id", "desc")
                 ->page($post["page"], $post["pageSize"])
                 ->select();