Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java

@@ -31,4 +31,9 @@
     * 所属部门责任单位
     */
    private Integer unitId;

    /**
     * 组织id
     */
    private Integer organizationId;
}