Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-22 c581a6c396f1b367fe132bc302d6337b1ff0ad6f

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java

@@ -12,6 +12,7 @@

    private Long id;
    private String orderId;
    private String processId;
    private String orderNumber;
    private Integer technologyNumber;
    private String process;