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

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

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

@@ -92,11 +92,6 @@
   }

   /**
    * 盐加密
    */
   private String salt;

   /**
    * 帐号状态（0正常 1停用）
    */
   private String status;