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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

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

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