Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -92,5 +92,10 @@
    */
   private String postId;

   /**
    * 农场id(负责的农场)
    */
   private String farmId;


}