Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

4 天以前 5e29b1323d051893de577c1a33c8bd30545fde1e

 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java

@@ -97,7 +97,7 @@
   private Double weight;

   @ApiModelProperty(value= "长度")
   private Double length;
   private Double man_length;

   @ApiModelProperty(value= "体积")
   private Double volume;