Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

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

@@ -7,6 +7,6 @@
@Data
public class Role {
    @TableId(type = IdType.AUTO)
    private String id;
    private Integer id;
    private String role;
}