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

guoyuji

2024-07-05 cac51e7aacded53a855a65d02ea6c57305ea15fe

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

@@ -26,7 +26,7 @@
    private String orderClassify;
    private String icon;
    private String packType;
    private String deliveryDate;
    private LocalDate deliveryDate;
    private String batch;
    private Integer calculateType;
    private Integer salesmanId;