guoyuji
2024-02-02 13d2dca3c08afcab131a9a350a5c5ad3ff6b2bee
解决部分冲突
1个文件已修改
1 ■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -12,7 +12,6 @@
    @TableId(type = IdType.AUTO)
    private Long id;
    private String orderId;
    private String orderId;
    private Integer orderNumber;
    private String buildingNumber;
    private Integer productId;