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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

@@ -89,6 +89,7 @@
    /**
     * 备注
     */
    @TableField("`desc`")
    private String desc;