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

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

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

@@ -148,6 +148,10 @@
    @TableField(exist = false)
    private Long[] postIds;

   /** 角色ID */
   @TableField(exist = false)
   private Long roleId;

    public SysUser(Long userId)
    {
        this.userId = userId;