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

pjb

2 天以前 9ea93abc2606948e5724316a4a3ec338ea14a130

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

@@ -149,7 +149,7 @@
     * 数量
     */
    @ApiModelProperty(value= "数量")
    private Integer count;
    private Double count;


    /**