Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2024-11-06 a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d

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

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

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

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

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