Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-14 16bbf8260110e2790f304e8421cf7591837ca302

 north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java

@@ -1,5 +1,6 @@
package com.example.erp.entity.pp;

import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;

import java.time.LocalDate;
@@ -42,5 +43,6 @@
    private String reportingWorkId;

    //外键流程卡表
    @TableField(select = false,exist= false)
    private FlowCard flowCard;
}