Merge remote-tracking branch 'origin/master'

NNowhZzU

2024-01-26 6f2a4980f4ca7a794b103cfde9946a905c5ba399

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

File was renamed from north-glass-erp/src/main/java/com/example/erp/entity/Order.java
@@ -7,7 +7,7 @@

@Data  //lombok 简写java代码 实体类的get与set
@TableName("`order`")
public class Order {
public class OrderTest {
    @TableId(type = IdType.AUTO)
    private  Integer id;
    private  String orderId;