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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

 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;