Merge remote-tracking branch 'origin/master'

Administrator

2023-08-16 aac3b819f2228192d918c419488a1dbc315443cc

 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java

@@ -75,6 +75,10 @@
    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
    private Integer pageSize;

    private String delName;

    private String delTime;

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)