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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

 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;