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

guoyuji

2024-12-10 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7

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

@@ -66,6 +66,9 @@
    private LocalDate updateTime;

    //查询用
    //标签打印数量
    @TableField(select = false,exist = false)
    private Integer printQuantity;
    //报工编号
    @TableField(select = false,exist = false)
    private String reportingWorkId;