Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-19 b48eb9d4a012c504eb4388341c382ffefb3637d2

 ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml

@@ -44,7 +44,8 @@
            TP.remark,
            TP.create_time,
            TP.update_time,
            TP.id
            TP.id,
            TP.parent_id
        FROM
            t_platform TP
        WHERE