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

lty

2 天以前 84edd2b6308fa018eab932a2db528b7e6e1e6d13

 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;