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

cjl

2023-07-27 44251a92dc85a93eff59704b40b07830bde8d16f

 screen-api/src/main/java/com/moral/api/entity/Supervision.java

@@ -33,6 +33,11 @@
    private Integer id;

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

    /**
     * 地区编码
     */
    private Integer cityCode;