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

cjl

2023-11-14 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1

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

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;