Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2026-05-15 c4bd3de981c3c1ed789000b2add48eabcc712c7f

 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;
}
}