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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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

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