Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

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

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

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


}