Merge branch 'master' into docker_package

Merge branch 'dev'
...
2023-01-06 17:29:09 +08:00 · 2023-01-06 17:29:02 +08:00 · 2023-01-06 17:28:55 +08:00
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
+++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
@ -86,7 +86,7 @@
            </foreach>
        </if>
        group by tf.id
-        ORDER BY ${orderField} ${orderType}
+        ORDER BY ${orderField} ${order}
    </select>
 </mapper>
Author	SHA1	Message	Date
wangliwen	e3bb49b72d	Merge branch 'master' into docker_package	2023-01-06 17:29:09 +08:00
wangliwen	3d496eebff	Merge branch 'dev'	2023-01-06 17:29:02 +08:00
wangliwen	477468b2e5	...	2023-01-06 17:28:55 +08:00