Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-07-30 780ec2ea0b558c5603012abbfb8c1fa9845e6734

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

@@ -189,5 +189,6 @@
    * 是否采集照片
    */
   private String photo;
   private String dispatch;

}