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

1

18 小时以前 5e567919108b4e1c914cdb1aae5d91ff2eb337d7

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

@@ -44,7 +44,7 @@
   @ApiModelProperty(value= "商品名称")
   private String maktx;

   @ApiModelProperty(value= "序列码")
   @ApiModelProperty(value= "批号")
   private String batch;

   @ApiModelProperty(value= "单据编号")
@@ -97,7 +97,7 @@
   private Double weight;

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

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