Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

昨天 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

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

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

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

    @ApiModelProperty(value = "部门ID")
    private Long deptId;
    private Integer deptId;

    @ApiModelProperty(value = "用户账号")
    private String account;