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

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

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

@@ -128,7 +128,7 @@
    * 身高
    */
   @ApiModelProperty(value = "身高")
   private Float height;
   private Integer height;
   /**
    * 联系电话
    */