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

guoyuji

2024-04-12 febc34d3642ad7d1b68be5ac49eea48089b3e2e0

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

@@ -6,7 +6,7 @@
@Data
public class Rework {
    //自增id
    private Integer id;
    private Long id;
    //返工编号
    private String reworkId;
    //流程卡号