Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-12 a122cfc45d18b6e679029a88eb342e9081df6595

 src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java

@@ -7,7 +7,6 @@
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -140,4 +139,4 @@

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}
}