Merge remote-tracking branch 'origin/master'

gaoluyang

3 天以前 7787f57521297df847bfd5f2b9af410b3fdac67e

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java

@@ -18,10 +18,10 @@

    @Schema(description = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    private Integer id;

    @Schema(description = "部门ID")
    private Long deptId;
    private Integer deptId;

    @Schema(description = "用户账号")
    private String account;