Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/ucenter/SceneProMapper.xml

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -59,7 +59,7 @@
 
     <sql id="HasFolder">
         <if test="param.hasFolder == 1">
-            SELECT * FROM (
+        select * from (
             SELECT id,name,1 as isFolder,type,parent_id as parentId,create_time,null as num,null as scene_name,null as scene_dec,
             null as status,null as pay_status,null as thumb,null as web_site,null as is_upgrade,null as sn_code,null as view_count, null as build_type
             FROM t_folder WHERE rec_status = 'A' and type = #{param.folderType} and user_id =#{param.userId}
@@ -69,8 +69,7 @@
             <if test="param.folderId == null">
                 AND parent_id is null
             </if>
-            order by create_time desc
-            ORDER BY create_time DESC) f
+            order by create_time desc ) as tb
             UNION
         </if>
     </sql>