Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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

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

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


}