Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zss

2025-04-18 ec1f20c31d64ddbc5242c3942902bc5233a8a140

 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml

@@ -88,7 +88,8 @@
        select id,
               account,
               name,
               name_en
               name_en,
               status
        from user u
        where depart_lims_id = (select u2.depart_lims_id
                                from user u2