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

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

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

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