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

廖井涛

2024-09-13 be8a84dd3610443ebc82a9c75f888920b882bf01

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

@@ -79,6 +79,10 @@
    @TableField(select = false,exist = false)
    private Integer merge;

    //补片原因
    @TableField(select = false,exist = false)
    private String patchReason;

    //外键订单表
    @TableField(select = false,exist= false)
    private Order order;