Merge remote-tracking branch 'origin/dev' into 5.X

疯狂的狮子Li

2023-12-23 2a9624d404acd466c76abdb21507748ef7b63fa5

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -85,6 +85,7 @@
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
        lqw.orderByAsc(SysDept::getParentId);
        lqw.orderByAsc(SysDept::getOrderNum);
        lqw.orderByAsc(SysDept::getDeptId);
        return lqw;
    }