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

chen_xi

2022-11-17 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a

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

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