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

guoyuji

2024-10-30 f2b7487e3722ce3218a8e23a6ac18c1b78fe6a2c

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