Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

gaoluyang

2026-09-24 a3d3ba426c2a5a6015888d5e32e0f9704b4d125c

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